Merge branch 'MDL-57090-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Nov 2016 02:43:16 +0000 (10:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Nov 2016 02:43:16 +0000 (10:43 +0800)

Trivial merge