Merge pull request #3196 from astrofrog/issue-3196

Issue with iterability of axes arguments [backport to 1.4.x]
Merge pull request #3880 from mdboom/iterable-axes-backport

Backport of #3196