Git commits in Moodle 3.0.4 by Helen Foster

commit f7423fa24019e73b64a1a6542d0b71c938489f97
Author: Helen Foster <helen@moodle.org>
Date:   Fri, 29 Apr 2016 01:02:48 +0800
Tag:    v3.0.4

MDL-53980 lang: Merge English strings from the en_fix language pack