Merge branch 'release/7.x-0.35' into develop
bug17774: scrollbar on popup window
tagging version 7.x-0.36
Merge branch 'release/7.x-0.36'