Skill pick up
Fixed merge conflicts.
Merge branch 'mk13-master'