Git merges in Moodle 2.7.19 by Dan Poltawski

commit 7f54185c69efa384b2051ba111ed8b8872388f37
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 24 Jan 2017 18:11:25 +0800
Tag:    v2.7.19

Merge branch 'MDL-57639-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

commit 54b3003c929699a9a2dec1f17c3550fa6147bf7f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 23 Jan 2017 17:49:29 +0800
Tag:    v2.7.19

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