Merge branch 'master' into mirceakitsune-movement