gridview header/footer fix
Merge pull request #2384 from zelenin/gridview-header-fix

gridview header/footer fix