Merge branch 'MDL-58566_master' of github.com:markn86/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 21 Apr 2017 03:52:35 +0000 (11:52 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 21 Apr 2017 03:52:35 +0000 (11:52 +0800)

Trivial merge