Merge branch 'master' into error-message-context