Keeping the branch up to the date with hotfixes