Merge branch 'MDL-57370-master-int-fix-1' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Feb 2017 09:14:07 +0000 (09:14 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Feb 2017 09:14:07 +0000 (09:14 +0000)

Trivial merge