Merge a few changesets from the default branch into the 0.2 branch.

Changesets:
 * b95fcaa6d694
 * 804c68d222b4
 * da8cd738da3d
 * 1109d5ce3419
 * d03f5c1ca95d
 * 2a7017722165
 * 4fccdc79eeb7
 * d228149fbc04
 * 8782d412a4a6