Set timezone to JIT correctly
Merge branch 'master' into php53

Conflicts:
	provision.sh