Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-20161027-2' into staging