Merge remote-tracking branch 'origin/master' into newstyles
[snf-cloudcms] / cloudcmsfaq / __init__.py