also merge hotfixes into master when they're finished