Git merges in Moodle 2.5.8 by Damyon Wiese

commit 426820a3c0651521613bc7328bf55cbf389d365a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 01 Sep 2014 11:30:13 +0800
Tag:    v2.5.8

Merge branch 'MDL-46619-2.5-visisble-authors-qanda' of https://github.com/amandadoughty/moodle into MOODLE_25_STABLE