Git merges in Moodle x.x.x by James Pratt

commit 6ebfe7e5f182fc582e374cbd44d257be74e686ac
Author: James Pratt <me@jamiep.org>
Date:   Wed, 20 Nov 2013 12:33:49 +0800
Tag:    v2.7.0-beta

Merge branch 'MDL-42957-26' into MDL-42957-master