Manually merge unstable to master because git was about to choke on itself again