drop guard, only relevant in direct/blockingqueued
aruco: fix fixating on the prev marker location
fix-build
Merge branch 'flush-20141005' into unstable

* flush-20141005:
  aruco: fix fixating on the prev marker location
  drop guard, only relevant in direct/blockingqueued