upstream/3.2.2

Mathias Behrle

@mbehrle

2dcaa65e · Adding upstream version 3.2.2. · Feb 24, 2015

Tagging upstream version 3.2.2.