Merge branch 'MDL-53367_master' of https://github.com/juancs/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Jan 2017 08:27:18 +0000 (08:27 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Jan 2017 08:27:18 +0000 (08:27 +0000)

Trivial merge