Merge branch 'master' into dev

Conflicts:
wa-apps/shop