Merge branch 'master_sync' into DJO-mastersync2-4deck
Merge branch 'master' into DJO-hacks-trunk

Conflicts:
	build/depends.py
	scripts/make_xone.py
	src/controlvaluedelegate.cpp
	src/engine/ratecontrol.h
resolve bad merges