Forgot to move some files
Merge branch 'master' into phantom0.2