more
As we have 2 types of package, let's use only the file name link to edit
and take off the "Edit" toolbar
Merge remote-tracking branch 'upstream/develop' into develop