7d19595 included in 1.11.2

Authored and Committed by Nalin Dahyabhai 11 years ago
    included in 1.11.2