Merge branch 'MDL-50666-master' of https://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 19 Dec 2017 23:49:28 +0000 (12:49 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 19 Dec 2017 23:49:28 +0000 (12:49 +1300)

Trivial merge