Merge branch 'master' of https://github.com/jorkey/incubator-wave