Merge back from develop

I wonder if I'll hit 50 by 1.0?