Merge branch develop into master

all kinds of goodies