Merge commit 'v1.3.3' into godsflaw
Merge remote-tracking branch 'upstream/master' into godsflaw
Hax to get test suit working again.
Merge pull request #319 from godsflaw/master

Got the test suit working again