Force git to automerge silently if merge succeeded. Refs #6653
Remove --patch option on git log. Not in git 1.7.1. Refs #6653
Merge branch 'feature/6653_workflow_macros' into develop