Add flag no-ff to feature finish.

This gives the ability to never fast-forward a merge, even when it's
only one commit.
Start of hotfix development
Bugfix: missed quotation mark
Version bump 1.4.1
Merge branch 'hotfix/1.4.1'
Merge tag '1.4.1' into develop

1.4.1