Fixed issue with vertical scrollbar when div vertical-align was overwritten by general css.
Merge remote-tracking branch 'origin/master'