Merge branch 'assorted-fixes' into 'master'

Merge fixes for Nicol Bolas, the Ravager part 2.

See merge request core-developers/forge!700
This commit is contained in:
Michael Kamensky
2018-07-01 04:26:57 +00:00