merge changes to master

see changelog for changes