Merge branch 'dw/build-system' into 0.7.1