Merge branch 'MDL-52614_master' of https://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 18:13:08 +0000 (18:13 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 18:13:08 +0000 (18:13 +0000)

Trivial merge