Merge branch 'hotfix/JAL-1530' into Release_2_8_2_Branch

Conflicts:
	src/jalview/gui/PopupMenu.java

diff --cc src/jalview/gui/PopupMenu.java
index 3cf4fe0,f5f92b9..ace4762
--- 1/src/jalview/gui/PopupMenu.java
--- 2/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@@ -2092,12 -1951,8 +2092,12 @@@ public class PopupMenu extends JPopupMe
      jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(
              jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
      chooser.setFileView(new jalview.io.JalviewFileView());
 -    chooser.setDialogTitle(MessageManager.formatMessage("label.select_pdb_file_for", new String[]{sequence.getDisplayId(false)}));\r
 -    chooser.setToolTipText(MessageManager.formatMessage("label.load_pdb_file_associate_with_sequence", new String[]{sequence.getDisplayId(false)}));\r
 +    chooser.setDialogTitle(MessageManager.formatMessage(
 +            "label.select_pdb_file_for", new String[]
 +            { sequence.getDisplayId(false) }));
 +    chooser.setToolTipText(MessageManager.formatMessage(
 +            "label.load_pdb_file_associate_with_sequence", new String[]
-             { new Integer(sequence.getDisplayId(false)).toString() }));
++            { sequence.getDisplayId(false) }));
  
      int value = chooser.showOpenDialog(null);