refs #2324 Number of iterations has been set to 500 (from 10,000.  In general, it it too much).
Merge branch 'release/3.1.0' into develop