Git merges in Moodle 3.1.6 by Jake Dallimore

commit 0af674082c697394b50363869d52a934165a9102
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 27 Apr 2017 13:34:11 +0800
Tag:    v3.1.6

Merge branch 'MDL-58701-31' of git://github.com/ankitagarwal/moodle into MOODLE_31_STABLE


commit e2180dbc896dd500bb758ca185c5053952ea1c63
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 26 Apr 2017 14:49:08 +0800
Tag:    v3.1.6

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


commit 454d532acbe3d1840002d70f1aca273efc91ece9
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 24 Apr 2017 15:18:13 +0800
Tag:    v3.1.6

Merge branch 'MDL-57793-31' of git://github.com/junpataleta/moodle into MOODLE_31_STABLE


commit 89cd3cfc0232aee65bbfb883f6f2888540abeada
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 21 Apr 2017 10:27:56 +0800
Tag:    v3.1.6

Merge branch 'MDL-58613-31-workshopfullname' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE