Merge pull request #611 from mpg/baremetal-proposed

Baremetal proposed