Merging master

I'm guessing this will fix our 1.9.3 travis errors with ohai

\cc @mcquin