Worked on Critical Edition Viewer Toolbar
Merge remote-tracking branch 'upstream/7.x' into 7.x