Use Python2.6 compatible .format syntax
Added disallowedContent configuration
Merge branch 'master' into prfuk