Git merges in Moodle 2.9.7 by Andrew Nicols

commit 65c1213e00fef443601606aabdc617683332d277
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 09:14:43 +0800
Tag:    v2.9.7

Merge branch 'MDL-53019_29' of git://github.com/stronk7/moodle into MOODLE_29_STABLE


commit 218d2c0eb332878cff5ca2bea5ceda6d4cd88866
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 May 2016 12:27:06 +0800
Tag:    v2.9.7

Merge branch 'wip-mdl-54564-m29' of https://github.com/rajeshtaneja/moodle into MOODLE_29_STABLE


commit 5c18bd041a4697cbe4bf2e4166c4805031a8c4f1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 May 2016 12:11:49 +0800
Tag:    v2.9.7

Merge branch 'MDL-54620_29' of git://github.com/dmonllao/moodle into MOODLE_29_STABLE