Merge (squash) branch 'develop'