Bugfix: marker coordinates in 2D rendering mode were not wrapping around.

Signed-off-by: Martin Matysiak <marmat@google.com>
Merge branch 'master' into gh-pages