Bump to version 0.3.6.1
Merge branch 'master' into next