Merge origin/master
Remove call to sleep()
Edit Makefile
Fix automerge issue caused by git-merge-changelog