Git merges in Moodle 3.1.6 by Jun Pataleta

commit c68568541f52a21b0f5398e5e07656980bb49a52
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 05 May 2017 14:45:00 +0800
Tag:    v3.1.6

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


commit 545174182a3883f4aa5c136f5ed62e6edeebd953
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 04 May 2017 14:51:07 +0800
Tag:    v3.1.6

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


commit 7b4ecf6fe2c0053f5fbdc2de9f59dd09a907cdc3
Author: Jun Pataleta <jun@moodle.com>
Date:   Wed, 26 Apr 2017 11:03:09 +0800
Tag:    v3.1.6

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


commit a7457acc523e54159859e3a8b9aaeab49713fe24
Author: Jun Pataleta <jun@moodle.com>
Date:   Mon, 24 Apr 2017 09:33:55 +0800
Tag:    v3.1.6

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


commit 11f3ea4f9432ae9c249641c75dd4303d082a91f8
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 07 Apr 2017 12:45:50 +0800
Tag:    v3.1.6

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