Git merges in Moodle 2.7.12 by Dan Poltawski

commit 9d5c4e3a310e11fa997836bd59e6520c1d0d5d0b
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Dec 2015 20:27:19 +0800
Tag:    v2.7.12

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


commit 39656c43ea0a883f898bbd7ad9062c8eeaa9da06
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 19 Nov 2015 14:49:41 +0800
Tag:    v2.7.12

Merge branch 'wip-MDL-52194-m27' of https://github.com/marinaglancy/moodle into MOODLE_27_STABLE