Merge branch 'master' into dev
mergers now support repetition

same style as the Output rule before, with some extras
Merge branch 'dev'