Fix Python 2.6 syntax error
Merge branch 'feature/titled-markup' into staging