update history
Merge remote-tracking branch 'origin/0.9.x'