Fix package name.
Merge branch 'master' into develop