upstream/2.2.12

Mathias Behrle

@mbehrle

e91902c4 · Adding upstream version 2.2.12. · Dec 12, 2013

Tagging upstream version 2.2.12.