Also fix scrolling for ajax errors
Merge branch 'rel_201408'