Merge pull request #1405 from FireBurn/master