0e4a7e2 Rebase patch on 0.7.0

Authored and Committed by adamwill 2 years ago
    Rebase patch on 0.7.0