Refs #6877. Trying a different tack.
Merge branch 'feature/6877_qtclucene_osx' into develop