Merge branch 'MDL-36233-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:34:27 +0000 (09:34 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:34:27 +0000 (09:34 +0000)

Trivial merge