Merge pull request #1746 from JoelHutton/jh/hikey

Jh/hikey