Fix bug 1034498, 1034586 - Site Flicker
Merge pull request #2540 from darkwing/flicker

Fix bug 1034498, 1034586 - Site Flicker
Merge master