fix for compatibility with initr, refs #4532
Merge branch 'master' into quotes