Merge Commit setting

C.J. Jameson requested to merge merge-request-merge-commit into master May 12, 2018