fast-forward local
Revert "fast-forward local"

This reverts commit 798b121887f72b6dcd20a64b170d6556ac857ae4.
Merge remote-tracking branch 'origin/master'