Hopefully this gets committed before 2014!