upstream/3.0.4

Mathias Behrle

@mbehrle

033ec475 · Adding upstream version 3.0.4. · Apr 16, 2014

Tagging upstream version 3.0.4.