Enable revisions for content type Page.
Fixed tiny conflict in info file.
Merge branch 'master' into development_branch
Merge branch 'master' into development_branch