Merge pull request #2872 from tecknicaltom/master