Sync develop against master

There have been changes committed to master that need to be on develop too.