fixing a bug with the 'content' option
Merge branch 'dev'