Merge branch 'master' into newfeatures
[snf-cloudcms] / cloudcms / __init__.py