3a11b6c Update for upstream release.

Authored and Committed by smilner 8 years ago
    Update for upstream release.
    
        
file modified
+1 -0
file modified
+15 -12
file modified
+1 -1