Redo previous merge.
Looks like there were some changes in my release repository that were accidentally included.