Rebase test

hey @tlberglund i was wondering if you could look at this merge