Merge branch 'MDL-34921_master_unwanted-sitehome-redirects' of https://github.com...
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Apr 2015 03:49:16 +0000 (11:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Apr 2015 03:49:16 +0000 (11:49 +0800)

Trivial merge