Merge branch 'master' into dev

| Conflicts:
|	packages/vuetify/src/components/VList/VList.tsx