Fix the non-diagnostic build.
refs #451
Merge branch 'develop' into merge-tree