Fix PEP8 errors (line length & whitespace)
merge develop -D org -I include -E exclude: PR 51 (Combine images param unwrap 11473 develop)
merge develop -D org -I include -E exclude: PR 52 (Export big images as jpeg 10841 dev 4 4 (rebased onto develop))