Fixes installing with pip.
Merge branch 'master' into sdk-1.8.0