match end/abort handling
Merge branch 'match-actions' of github.com:froj/nastya into match-actions