Merge branch 'master' into work
v0.3.6
Merge branch 'work'