Removed the __set because, really, it's not needed
Merge remote-tracking branch 'origin/tags' into tags