(v0.9.2-SNAPSHOT) Update master to 0.9.2-SNAPSHOT