Merging recent changes to master into dev-master

This morning, I changed the workflow to include dev-master. This PR contains commits made to master that also need to be applied to dev-master.