merge in changes from 2.0 ongoing. Includes the build type in the package name and...