Merge branch 'master' into orig

im too stupid for git :(