Git merges in Moodle 2.9.7 by Dan Poltawski

commit 81b1e515f400b20063d079fa0ac536196ab2c695
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 20 May 2016 17:15:24 +0800
Tag:    v2.9.7

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