db9848c Sync with upstream master branch

Authored and Committed by fweimer 7 years ago
    Sync with upstream master branch
    
    Resolves #1326903, #1337140.
    
        
file modified
+0 -246
file modified
+8 -2
file modified
+1 -1