Update File Manager.  Update editor icons.
Merge remote-tracking branch 'origin/develop' into develop