Merge branch 'master' into develop
Fixed leftover theme version issue
Merge branch 'develop'