Add Hotkeyfix Cant Build
Merge remote-tracking branch 'upstream/master'