0.6 snapshot
Merge remote-tracking branch 'origin/master'