Merge branch 'MDL-55196_master' of https://github.com/andrewhancox/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 11:00:47 +0000 (12:00 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 11:00:47 +0000 (12:00 +0100)

Trivial merge