update
Merge branch 'master' into dev-0.6