1.6.0

Merge to master