Eclipse merge.
Merge branch 'master' of github.com:cassiel/net.loadbang.osc