Fix some Landscape.io errors and warnings
Merge remote-tracking branch 'upstream/master' into landscape-fixes
Don't use builtin as variable
Make test_imaging_stretch.py runnable as a standalone script
Fork from master and send pull requests to master

Master is essentially our dev branch.

[CI skip]
Merge pull request #992 from hugovk/testimagingstretch

Make test_imaging_stretch.py runnable as a standalone script
Merge pull request #984 from hugovk/landscape-fixes

Fixed duplicate imports, naming variables after builtins