Merge branch 'plugin'
stuff1
stuff2
Merge branch 'stuff'
work1
work2
work3
Merge branch 'work'
plugedit1
plugedit2