Fix the build on OSX.  Refs #6749.
Merge branch 'feature/6749_import_fp_irf' into develop