CMS
Merge branch '1.2' of github.com:cockatoo-org/Cockatoo into 1.2