Merge branch 'release/v2.10.4' into develop
fix missing material path
Merge branch 'master' of https://github.com/el-josho/avango into el-josho-master
Version bump.
Merge branch 'release/v2.10.5'