Sneaking in one last commit before the gitflow hammer comes down