Changed tracking of archives from events to views.
Merge remote-tracking branch 'origin/master'