Merge branch 'MDL-55071-rebased' of git://github.com/danpoltawski/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Sep 2016 09:28:12 +0000 (10:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Sep 2016 09:28:12 +0000 (10:28 +0100)

Trivial merge