release--1008
706a748f · Merging master branch. · Apr 27, 2011