Merge branch 'master' into dev
Snyc nodequeue and auto_nodequeue versions to be compatible.
Merge branch 'dev'