Merge pull request #3000 from teknoraver/master