It's 2014!
Merge branch 'master' into patch_ColorProcessor