upstream/3.6.0
2e8a0994 · Get ready for 3.6.0 release (#158) ·