Prevent crash on OSX. Refs #7637.
Merge branch 'feature/7637_improve_icat_gui' into develop