Pioneer commit with modified cpp. Version running stable.
Merge branch 'local' on pioneer

Conflicts:
	src/image_deinterlacer_xb3.cpp