f45bb37 update to latest upstream

Authored and Committed by Jon Disnard 8 years ago
    update to latest upstream
    
    A merge from master branch, some variations in time line were
    reconciled.
    
        
file modified
+0 -6