Fix villager skin override bug if villager skin is non-default.
Merge remote-tracking branch 'origin/master'