Merge pull request #4080 from jmarshallnz/skin_color_reload