3.6.1
3.6.2
3.6.3
Merge remote-tracking branch 'origin/3.6'