Merge develop into master

mostly a cleanup merge