Merge branch 'master' of github.com:camunda/camunda-bpm-platform