Merge branch 'MDL-52186-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 02:42:08 +0000 (10:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 02:42:08 +0000 (10:42 +0800)

Trivial merge