Switched from WeakKeyDictionary to actually storing behaviors using labeled descriptors
Merge remote-tracking branch 'origin/master'