Merge branch 'BugFixesTake2' into 2.0.0-alpha
Merge remote-tracking branch 'origin/2.0.0-alpha' into 2.0.0-alpha
Fix remaining unit tests
Merge pull request #1514 from markewallace/BugFixesTake3

Bug fixes take3