Commit ad2b54dc authored Apr 23, 2018 by Andreas Klöckner

Merge branch 'rework-block-generator' into 'master'

Rework block generator

See merge request !78