Merge branch 'MDL-56965-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Nov 2016 10:08:10 +0000 (10:08 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Nov 2016 10:08:10 +0000 (10:08 +0000)

Trivial merge