switch to stable version of stupidMessageQueue
Merge branch 'master' into 2.2