Git merges in Moodle 2.7.14 by Dan Poltawski

commit 3ac5c9214f0bb859527e2d071a6fa0a93721ff38
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 29 Apr 2016 22:55:12 +0800
Tag:    v2.7.14

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

commit 858d152f00a7b1745a660284d2e3637bec4e65d6
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 31 Mar 2016 14:06:54 +0800
Tag:    v2.7.14

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