Pulling in fixes done from fork stain/artifactory-with-mysql

I want to pull in the fixes from @stain's fork (stain/artifactory-with-mysql) that are not related to the MySQL stuff.