Patch to Beta 36 because overlay.js got truncated.
Merge branch 'develop'