Fixed clang implicit type cast warning
Merge remote-tracking branch 'thequux/master'

Conflicts:
	SConstruct