Merge branch 'dev' into next

| Conflicts:
|	packages/vuetify/src/components/VTable/_variables.scss