xMerge branch 'master' into boost_color_implementation