Make sure isn't defined before defining it, making it possible for someone to disable it with a preprocessor declaration.
Merge branch 'master' into imageRep