Committed for Rowtree.
Merge pull request #2641 from SkyMarshal/master

Commit for Rowtree