added missing return
Merge branch 'master' into next
0.6.7