Merged with branch 1.0.