update modules
update modules and fix Extensions
Merge branch 'master40'