Accidently made a hotfix in the master branch

I accidentally made a a hotfix in the master branch :(.  So lets merge the most recent master branch to the develop branch.