Git merges in Moodle 2.6.3 by AMOS bot

commit 9ae6b73cafbf8d27221e1634fc2d8bd98531801f
Author: AMOS bot <amos@moodle.org>
Date:   Wed, 23 Apr 2014 08:38:06 +0800
Tag:    v2.6.3

Merge branch 'MOODLE_26_STABLE' into install_26_STABLE