fix modal double scroll bar
Merge branch 'master' into 2.5