67bcc83 Rebase patch from previous commit on 3.5.1

Authored and Committed by adamwill 5 years ago
    Rebase patch from previous commit on 3.5.1