Git merges in Moodle 2.6.7 by AMOS bot

commit a2b62eebcb27c8d045aef0b7e90f299a9c7627b9
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 21 Nov 2014 00:05:49 +0800
Tag:    v2.6.7

Merge branch 'MOODLE_26_STABLE' into install_26_STABLE