Git merges in Moodle 2.7.1 by AMOS bot

commit 807d45073abcb32bf95793c83447fd627652c122
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 13 Jun 2014 08:41:59 +0800
Tag:    v2.7.1

Merge branch 'MOODLE_27_STABLE' into install_27_STABLE