Merge branch 'generator-pipeline-id' of github.com:d2rk/groningen into generator-pipeline-id