Merge branch 'MDL-57658-master-integration-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Mar 2017 03:42:28 +0000 (11:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Mar 2017 03:42:28 +0000 (11:42 +0800)

Trivial merge