Cleanup for Milestone 2 release.
Merge branch 'master' of git://github.com/ngochuy2101/0