resynchronize with master

so that changes to `master` can (in theory) be applied to `dev` as well