Merge branch 'master' of https://github.com/Eyescale/hwsd
Merge branch 'master' of https://github.com/Eyescale/hwsd
Merge branch 'master' of https://github.com/Eyescale/hwsd
Merge branch 'master' of https://github.com/Eyescale/hwsd
Merge branch 'master' of https://github.com/Eyescale/hwsd
Fix build