Merge to master for release 1.6