Git merges in Moodle 2.2.9 by Damyon Wiese

commit 395f9fe90d21772097f6b8b09e0d7533b6c298d9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 15 Mar 2013 11:11:31 +0800
Tag:    v2.2.9

Merge branch 'MDL-38474-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE