Merge add-skovenborg from upstream

This is only a test. I just want to try merging the other way...