refs #9955. Document and format.
Merge branch 'feature/9955_nans' into develop