Merge develop into master

Preparing for 1.6.1