Git merges in Moodle 2.5.9 by AMOS bot

commit 4ddf05260f43d041fe72024410192d1c6dd8ee7d
Author: AMOS bot <amos@moodle.org>
Date:   Sun, 09 Nov 2014 00:05:42 +0800
Tag:    v2.5.9

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE