Merge 1.1.4
Merge branch 'master' of git://git.code.sf.net/p/genericusbxhci/code