Extended the php5-fpm timeout to 3600 seconds.
Merge branch 'master' into add/database-rebuild-choice

Conflicts:
	bootstrap.sh