Fixed compatibility problem
Merge branch 'trunk' into BrowserSupport