Use layers to ease skeleton weapon switch rendering
Merge remote-tracking branch 'upstream/master'