Git merges in Moodle 2.9.7 by Eloy Lafuente (stronk7)

commit 33d0756aac680a2aefd34e246c67b6ca8c047c60
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sun, 10 Jul 2016 06:29:07 +0800
Tag:    v2.9.7

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