changed random number seed for automated tests and had to tweak a few tests
Merge remote-tracking branch 'origin/master'