Merge branch 'master' into feature/7739_work_multibanks
Fixed a bug.  Refs #7739.
Merge branch 'feature/7739_work_multibanks' into develop