upstream/2.8.4

Mathias Behrle

@mbehrle

6e6449ec · Adding upstream version 2.8.4. · Feb 18, 2015

Unverified

Tagging upstream version 2.8.4.