allow for null subject
Merge branch 'master' into dev