Fix possible BSoD
Merge remote-tracking branch 'origin/1080p' into 1080p