Merge branch 'master' into swift3

# Conflicts:
#	.travis.yml
#	BuildControl/bin/releaseMe.sh
#	BuildControl/bin/travisBuildHelper.sh
#	BuildControl/config/Debug.xcconfig
#	BuildControl/config/Project.xcconfig
#	BuildControl/config/Tests.xcconfig
#	BuildControl/config/iOS.xcconfig
#	BuildControl/config/watchOS.xcconfig
#	BuildControl/repos.xml
#	CleanroomBridging.xcodeproj/project.pbxproj
#	INTEGRATION.md
#	README.md

Author: Evan Maloney

BuildControl/Info-Framework.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.1</string>
+	<string>0.8.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>