Merge branch 'MDL-57192-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Jan 2017 10:58:46 +0000 (11:58 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Jan 2017 11:34:01 +0000 (11:34 +0000)

Trivial merge