Minor typo fix for bug#1192118.
Merge branch 'release_30' into release_31

Minor typo fix for bug#1192118.
Merge branch 'release_31' into development

Minor typo fix for bug#1192118.
Move some replay globals to class variables.