Merge pull request #3148 from crazedpsyc/master