Use wildcards to be color agnostic
Merge branch 'develop' into develop.macosx