Merge branch 'MDL-57821-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 5 Apr 2017 01:39:02 +0000 (09:39 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 5 Apr 2017 01:39:02 +0000 (09:39 +0800)

Trivial merge