Merge branch 'MDL-55127_master-fix-everything' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 25 Aug 2016 09:26:21 +0000 (10:26 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 25 Aug 2016 09:26:21 +0000 (10:26 +0100)

Trivial merge