merge develop -D org -I include -E exclude: PR 31 (Don't allow jpeg export of Big images)
merge develop -D org -I include -E exclude: PR 33 (Fix some minor typos.)