Possible fix for issue 52, NULL diagnostic from expectThat
Merge branch 'master' into snapshots