Resolved conflict with origin master

I think this should work, merge and then we can both get back to working with a clean sync.