Sync Trunk with Master branch

Mistake on Tkoy's part for updating the Master branch instead of the Trunk. Updates should be done on the Trunk