Git merges in Moodle 2.7.18 by Dan Poltawski

commit 7815c64b0ce358e35a45e247b24a12b9ddde7a35
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Jan 2017 21:30:59 +0800
Tag:    v2.7.18

Merge branch 'MDL-57531-27-phpmailer' of git://github.com/mudrd8mz/moodle into MOODLE_27_STABLE


commit 7bef8b0693a7beb935f2c2246dd17a7ac973124e
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Nov 2016 21:36:10 +0800
Tag:    v2.7.18

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