ST3 Compatability
Merge pull request #2402 from wesbos/patch-4

ST3 Compatability