module and core updates
Merge branch 'master' of https://github.com/testevez/karinandtony