Merge branch 'master' into work
update dependencies
Merge branch 'work'