Git merges in Moodle 3.2.0 by AMOS bot

commit 09ade73632ae6fa739ad9b98f8645224ea8e0aa7
Author: AMOS bot <amos@moodle.org>
Date:   Thu, 01 Dec 2016 00:05:38 +0800
Tag:    v3.2.0-rc5

Merge branch 'master' into install_master

commit c61d7c0802a4d7e8c6f3ea60dee31c819dd90091
Author: AMOS bot <amos@moodle.org>
Date:   Thu, 24 Nov 2016 00:06:13 +0800
Tag:    v3.2.0-rc3

Merge branch 'master' into install_master