upstream/4.2.1

Mathias Behrle

@mbehrle

d1c047aa · Adding upstream version 4.2.1. · Jun 11, 2017

Unverified

Tagging upstream version 4.2.1.