ead view fix
Merge remote-tracking branch 'origin/13.06-ead' into 13.06-ead