Merge branch 'master' of https://github.com/thalerj/openbmc-tools

Change-Id: I75ed1cb71d6e9edb07e1ae9ceadb00c752745018