Merge latest changes from 2018-patches into v28r2p1-patches
This should have merged in the changes from the final form of 2018-patches into v28r2p1-patches. For any conflicts I took the changes in v28r2p1-patches .
This should have merged in the changes from the final form of 2018-patches into v28r2p1-patches. For any conflicts I took the changes in v28r2p1-patches .