Merge ASAP

You asked me to delete that, so merge ASAP because a copy of it is on your fork.