upstream/3.6.6

Mathias Behrle

@mbehrle

79be6aaa · Adding upstream version 3.6.6. · Jan 17, 2016

Tagging upstream version 3.6.6.