Merge commit 'HEAD'; commit 'origin/master'