Merge topic 'doc-buildsystem'