Is this OK to merge to the 4.0 branch?
@Tom, Yes please!
Marshall, what do you think?
I'm fine with this.
Approved. Eric can you merge this?
Merged in r302071.