promiseThat: Add a test for the optional message parameter
Merge branch 'promises'