merge develop branch from last Dec into master

forgot to do this before xmas morning