Good to know.  I think we have to be quite careful when merging and rebasing this, #443, #422 and the work I'm currently doing for https://www.pivotaltracker.com/story/show/48066725.  All of these are messing in the same area.