Git merges in Moodle 2.9.9 by Eloy Lafuente (stronk7)

commit 3c413110ffa6fa84a2b9fc5ecac4e587f3232c00
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 13 Nov 2016 03:21:19 +0800
Tag:    v2.9.9

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