Merge branch 'fix/Queue_scan_consolidation' into edge
authorMichael Moon <triffid.hunter@gmail.com>
Fri, 27 Dec 2013 01:43:28 +0000 (12:43 +1100)
committerMichael Moon <triffid.hunter@gmail.com>
Fri, 27 Dec 2013 01:43:28 +0000 (12:43 +1100)

Trivial merge