Manually merge changes from commit: 0f3e0d7
Manually merge changes from commit: 0f3e0d7

0f3e0d78f48ea74813a5d595e1018986cda913e0

czpython/aldryn-newsblog,czpython/aldryn-newsblog,czpython/aldryn-newsblog,czpython/aldryn-newsblog