#3 new Ohai 7
#3 new Ohai 7
Merge branch 'master' into dev