Merged from 1.0.9