Synced Master with Trunk

Mistake on the part of Tkoy's update. Update's should be done on the Trunk, not on the Master