Merging branch 0.2.8 from revision 10655 to 10661:
Merging branch 0.2.8 from revision 10650 to 10655: