Merge branch 'master' of https://github.com/frostalf/hubreboot.git