Merge branch 'release/0.9.41'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Leftover fixes for django due to pyc file
merge conflict