Git merges in Moodle 2.8.x by AMOS bot

commit 340df7eb345bd8a84fdf02973b61a96dac158512
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 13 Jun 2014 08:41:51 +0800
Tag:    v2.8.0-beta

Merge branch 'master' into install_master