Ensure that parametrisedMessage is indeed parametrised
Merge branch 'master' into raven-3.x