Fixing broken code sample
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Fixing migration
Fixing migration typo
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge remote-tracking branch 'origin/release' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge pull request #443 from python/master

Merge branch 'master' into release