Merge remote-tracking branch 'origin/master' into HEAD

Fixed loss of precision with nDisplay overrides

Merge remote-tracking branch 'origin/master' into chaos

Merge remote-tracking branch 'origin/master' into chaos

Subs update