upstream/3.6.0
Christoph Berg's avatar
Christoph Berg
@myon
60a2b242 · Import Upstream version 3.6.0 · 
Upstream version 3.6.0