e880be9 backport fixes from upstream to release 0.9.9.0-32.git20131003

Authored and Committed by thaller 10 years ago
    backport fixes from upstream to release 0.9.9.0-32.git20131003
    
        
file modified
+14 -1