Future import bugfix, sorry!
Merge branch 'master' into next