Merge remote-tracking branch 'origin/feature/6902_built_and_installed_on_osx'
re #7040 remove irritating warning
Merge branch 'feature/7040_removeWarning' into develop