Merge pull request #2274 from z00nx/master