Fixed problem with fixel colour windowing
Merge branch 'github_master' into C++11