Check that Webserver is not Apache/1.x in light of installer assets/.htaccess alterations
Merge branch 'hackfest_may_2013' of https://github.com/NightJar/sapphire into 3.1

Conflicts:
	docs/en/changelogs/3.1.0.md