Bugfix: marker was stuck in a corner if initially behind the camera.
Merge branch 'master' into gh-pages