upstream/2.6.0
a1a83fb0 · Adding upstream version 2.6.0. ·