Merge branch 'MDL-52199-incoming-nice-fail' of https://github.com/brendanheywood...
authorDan Poltawski <dan@moodle.com>
Wed, 30 Nov 2016 09:52:35 +0000 (09:52 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 30 Nov 2016 09:52:35 +0000 (09:52 +0000)

Trivial merge