Development to master 2

This should be in the previous merge to master.