af8728 Merge review fixes.

Authored and Committed by limb 6 years ago
    Merge review fixes.
    
        
file modified
+8 -6