Merge branch 'MDL-54993' of https://github.com/sk-unikent/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jun 2016 09:18:11 +0000 (10:18 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:56 +0000 (09:24 +0100)

Trivial merge