v0.6
Merge branch 'master' into p4branch