Merge remote-tracking branch 'ethereum/develop' into sol_swapConstants

Conflicts:
	test/solidityOptimizerTest.cpp