Merge branch 'candidate'
Add reminder to use --no-ff
Merge branch 'merge-with-no-ff' into candidate