Merge pull request #3054 from zillatrooper:master