Merge branch '2.3' of git://github.com/networking/init-cms-bundle
Merge branch '2.3' of git://github.com/networking/init-cms-bundle