bump to 3.2.6
fix deprecation warning
Merge remote-tracking branch 'upstream/master'