Merge branch 'master' of https://github.com/Eyescale/CMake
Merge branch 'master' of https://github.com/Eyescale/Collage
Provide a define to deactive byteswapping
Fix doxygen warning
Merge branch 'master' into plugins