Make sure we switch to nodequeue 3.x manually with full auto_nodequeue support
Merge branch 'f-nodequeue' into dev
Merge branch 'dev'