upstream/3.2.1

Mathias Behrle

@mbehrle

b14acc00 · Adding upstream version 3.2.1. · Jul 02, 2014

Tagging upstream version 3.2.1.