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

Changesets:
 * 4122c2fe2aaa
 * 5280d39d0a1a
 * 7dcedafb43a4
 * 1a7bc2049db1
 * 12cc1ee22047