815585a upstream 1.2.1

Authored and Committed by cdamian 13 years ago
    upstream 1.2.1