Fixed a possible memory error.  Refs #7506.
Merge branch 'feature/7506_calibrate_mem_leak' into develop