Merging "update to 0.46 by aklassen" into hotfix branch

Since "hotfix" will be the active branch for the time being it needs to be updated.