Merge remote-tracking branch 'origin/0.10'