push to new branch
Merge branch 'master' into wait_queues

Update to wait_queues made by Ross
endless freezing
merged with master/ross's user_helper
Merge pull request #2 from jdk514/wait_queues

Wait queues