fixes #148 history loop in list views
Merge remote-tracking branch 'origin/develop' into develop