Remove enviroment values
Merge remote-tracking branch 'origin/master'

Conflicts:
	script/coveralls.php
Merge remote-tracking branch 'origin/master' into 1.2.0-wip

Conflicts:
	script/coveralls.php