Initial 1.5 update
Merge pull request #387 from GunfighterJ/2.9

Initial 1.5 update