c73dae8 Merge branch 'master' into pull_request_workflow

Merged and Committed by intrajp 7 years ago
    Merge branch 'master' into pull_request_workflow
    
    Merged because master merged with upstream
    
        
file modified
+1 -1
file modified
+10 -5
file modified
+1 -1