Merge branch 'master' into martial_arts