merge with default there is some 3.6 related fix and test change that we need on default. No other significant change happened since last release expect for split, still marked experimental. So we prepare for a bugfix release.

syntax: re
/figures/[^/]+\.png$
^docs/build/
^docs/html/
^html/
\.pyc$
~$
\.swp$
\.orig$
\.rej$
\.err$
^tests/easy_run.sh$
^build/
^MANIFEST$
^docs/tutorials/.*\.rst$
\.ico$