upstream/1.8.4

Mathias Behrle

@mbehrle

5e9845cb · Adding upstream version 1.8.4. · Oct 10, 2011

Tagging upstream version 1.8.4.