Allow for empty commits
Merge branch 'develop': Empty commits ok now