Updated merge with the no fast-forward.
Merge branch 'master' of https://github.com/poppe1219/dragonfly-scripts