v3.6.0
51e1564c · Merge branch 'release/3.6.0' into develop · Mar 20, 2019