Merge branch 'MDL-57586-master' of https://github.com/nashtechdev01/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jan 2017 08:33:53 +0000 (08:33 +0000)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Feb 2017 05:01:25 +0000 (13:01 +0800)

Trivial merge