Test merge commit parents
Merges can now be fastforwards
Merge branch 'merge-allow-fastforward' into develop