bugfix for chrome 36
Merge pull request #1701 from shackbarth/chrome-fix2

bugfix for chrome 36
Fix merge conflict