Git merges in Moodle 3.1.4 by AMOS bot

commit 5a9fcb1e7e6929880f8b23a01386a5cca4667146
Author: AMOS bot <amos@moodle.org>
Date:   Thu, 01 Dec 2016 00:05:52 +0800
Tag:    v3.1.4

Merge branch 'MOODLE_31_STABLE' into install_31_STABLE


commit af23df9c805ceab4446110b5f8f0ae0663ba53ea
Author: AMOS bot <amos@moodle.org>
Date:   Thu, 24 Nov 2016 00:06:29 +0800
Tag:    v3.1.4

Merge branch 'MOODLE_31_STABLE' into install_31_STABLE