This should be sans the ugly merge commits 

But, you might need to update your master