Andrew Black - 2015-04-10

I'm currently prototyping an implementation of this on the 'development' branch.