Merge branch 'master' of C:\Users\Rodolfo\Development\Projects\cloaked-octo-chat with conflicts.
Event wait queues