Merge master

Merge changes in the master branch and resolve conflicts.