Fixed build for OSX.  Refs #7948.
Merge branch 'feature/7948_correct_gsas_format' into develop