OM-296: `no-local-merge-pending-state` was not setting `:previous-state`
Merge branch 'master' of github.com:swannodette/om