Merge remote-tracking branch 'github/0.6' into 0.6