Merge remote-tracking branch 'upstream/develop' into develop
Fixed strange static var access bug

For safety, made all static accesses for such flags standard.
Merge pull request #395 from mbehrooz/develop

Fixes rummy issue