Merge 'content' branch into 'master'
Merge branch content into master
Merging showing commit box
Merge branch 'content' of https://github.com/librecms/librecms into content