Hmmm, I thought I had committed this to master already, weird...