Update Stable

Aaron Brayrequested to merge
integration into stable

Get all the changes from 4.2 into stable The engine is working pretty well with all these together Still need to fix a few known issues and validate

Merge request reports