Merge branch 'MDL-57570-master' of https://github.com/mwehr/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Jan 2017 00:27:36 +0000 (01:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Jan 2017 00:27:36 +0000 (01:27 +0100)

Trivial merge