Merge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Dec 2016 08:45:16 +0000 (08:45 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Dec 2016 08:45:16 +0000 (08:45 +0000)

Trivial merge