upstream/3.0.6

Mathias Behrle

@mbehrle

91294bac · Adding upstream version 3.0.6. · Aug 26, 2014

Tagging upstream version 3.0.6.