a950da3 Rebase patch30

Authored and Committed by hhorak 7 years ago
    Rebase patch30