Git merges in Moodle 3.2.1 by AMOS bot

commit 49e5d04a8d90bb6c033428fb0bca3dcd8e0010cc
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 09 Dec 2016 00:04:15 +0800
Tag:    v3.2.1

Merge branch 'MOODLE_32_STABLE' into install_32_STABLE