Merge branch 'MDL-48947_v3_patch' of https://github.com/Syxton/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 Oct 2015 15:12:09 +0000 (16:12 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 1 Oct 2015 15:12:09 +0000 (16:12 +0100)

Trivial merge