9e1f883 sync with upstream 9b8f4e38 (fixes #928370)

Authored and Committed by kdudka 11 years ago
    sync with upstream 9b8f4e38 (fixes #928370)
    
        
file modified
+16 -24