Git merges in Moodle 2.8.12 by Eloy Lafuente (stronk7)

commit 5f84553fabb1fd319523699e68188e6d7941167d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 08 May 2016 06:23:39 +0800
Tag:    v2.8.12

Merge branch 'install_28_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_28_STABLE