Merge branch 'master' into feature_buffer_offsetting
first implementation of buffer-offsetting for testing
Test code for buffer_offsetting
adapt values
comment out debug code safely
Merge branch 'buffer_offsetting'