Merge remote-tracking branch 'upstream/master' into fork_sync

src/main/java/bdv/spimdata/XmlIoSpimDataMinimal.java

...va/bdv/spimdata/legacy/AbstractLegacyViewerImgLoader.java

src/main/java/bdv/spimdata/legacy/LegacyViewerImgLoader.java

.../bdv/spimdata/legacy/LegacyViewerImgLoaderExtWrapper.java

...ava/bdv/spimdata/legacy/LegacyViewerImgLoaderWrapper.java

.../java/bdv/spimdata/legacy/XmlIoSpimDataMinimalLegacy.java

src/main/java/bdv/spimdata/tools/ChangeAttributeId.java

src/main/java/bdv/spimdata/tools/ChangeViewSetupId.java

src/main/java/bdv/spimdata/tools/MergeExample.java

src/main/java/bdv/spimdata/tools/MergePartitionList.java

src/main/java/bdv/spimdata/tools/MergeTools.java

src/main/java/bdv/tools/HelpDialog.java

src/main/java/bdv/tools/InitializeViewerState.java

src/main/java/bdv/tools/RecordMaxProjectionDialog.java

src/main/java/bdv/tools/RecordMovieDialog.java

src/main/java/bdv/tools/ToggleDialogAction.java

src/main/java/bdv/tools/VisibilityAndGroupingDialog.java

...java/bdv/tools/bookmarks/BookmarkTextOverlayAnimator.java

src/main/java/bdv/tools/bookmarks/Bookmarks.java

src/main/java/bdv/tools/bookmarks/BookmarksEditor.java