Add changes from upstream

To make sure git doesn't complain about conflicts later