Sync with roxy

I just merged the roxy branch in stoney. FWIW, there's no diff in the end result. Which is good :-)