Merge branch 'callofdutyops-master'