diff --git a/js/controllers/grid/articleGalleys/ArticleGalleyGridHandler.js b/js/controllers/grid/articleGalleys/ArticleGalleyGridHandler.js
index 835afdb6b4e..f43d5893d54 100644
--- a/js/controllers/grid/articleGalleys/ArticleGalleyGridHandler.js
+++ b/js/controllers/grid/articleGalleys/ArticleGalleyGridHandler.js
@@ -56,10 +56,13 @@
 			prototype.uploadFileHandler_ = function(sourceElement, event, rowId) {
 
 		// FIXME: Inter-widget messaging is needed here.
-		setTimeout(function() {
-			$('a[id^="component-grid-articlegalleys-articlegalleygrid-row-' + rowId +
-					'-addFile-button-"]').click();
-		}, 0);
+		var selector = 'a[id^="component-grid-articlegalleys-articlegalleygrid-row-' +
+				rowId + '-addFile-button-"]';
+		$.when($(selector)).then(function() {
+			$(function() {
+				$(selector).click();
+			});
+		});
 	};
 
 
diff --git a/js/pkp.min.js b/js/pkp.min.js
index 6f2ab52dd48..0108a5b457f 100644
--- a/js/pkp.min.js
+++ b/js/pkp.min.js
@@ -197,7 +197,7 @@ c);return!0};a.pkp.controllers.SiteHandler.prototype.processOutsideClickCheck_=f
 for(d in b.unsavedFormElements_)d&&c++;if(0<c)return a.pkp.locale.form_dataHasChanged};a.pkp.controllers.SiteHandler.prototype.isFormUnsaved=function(a){return null!==this.unsavedFormElements_&&void 0!==this.unsavedFormElements_[a]?!0:!1};a.pkp.controllers.SiteHandler.prototype.showNotificationResponseHandler_=function(a,c){this.showNotification_(c)};a.pkp.controllers.SiteHandler.prototype.showNotification_=function(a){var c,d,a=this.handleJson(a);if(!1!==a&&a.content.general)for(c in a=a.content.general,
 a)for(d in a[c])new PNotify(a[c][d])};a.pkp.controllers.SiteHandler.prototype.openModal_=function(){this.getHtmlElement().addClass("modal_is_visible")};a.pkp.controllers.SiteHandler.prototype.closeModal_=function(){var a=this.getHtmlElement();a.find(".pkp_modal.is_visible").length||a.removeClass("modal_is_visible")};a.pkp.controllers.SiteHandler.prototype.registerScrollingObserver_=function(b,c,d,e){a(document).scroll(e);return!1};a.pkp.controllers.SiteHandler.prototype.unregisterScrollingObserver_=
 function(b,c,d,e){a(document).unbind("scroll",e);return!1}})(jQuery);(function(a){a.pkp.controllers.UrlInDivHandler=function(a,c){this.parent(a,c);this.sourceUrl_=c.sourceUrl;this.reload();c.refreshOn&&this.bindGlobal(c.refreshOn,this.reload)};a.pkp.classes.Helper.inherits(a.pkp.controllers.UrlInDivHandler,a.pkp.classes.Handler);a.pkp.controllers.UrlInDivHandler.sourceUrl_=null;a.pkp.controllers.UrlInDivHandler.prototype.reload=function(){a.get(this.sourceUrl_,this.callbackWrapper(this.handleLoadedContent_),"json")};a.pkp.controllers.UrlInDivHandler.prototype.getSourceUrl=
-function(){return this.sourceUrl_};a.pkp.controllers.UrlInDivHandler.prototype.setSourceUrl=function(a){this.sourceUrl_=a};a.pkp.controllers.UrlInDivHandler.prototype.handleLoadedContent_=function(a,c){var d=this.handleJson(c);!0===d.status?void 0===d.content?this.getHtmlElement().hide():(/msie/.test(navigator.userAgent.toLowerCase())?this.html(d.content):(this.getHtmlElement().hide(),this.html(d.content),this.getHtmlElement().fadeIn(400)),this.trigger("urlInDivLoaded",[this.getHtmlElement().attr("id")])):
+function(){return this.sourceUrl_};a.pkp.controllers.UrlInDivHandler.prototype.setSourceUrl=function(a){this.sourceUrl_=a};a.pkp.controllers.UrlInDivHandler.prototype.handleLoadedContent_=function(b,c){var d=this.handleJson(c),e=this;!0===d.status?void 0===d.content?this.getHtmlElement().hide():(/msie/.test(navigator.userAgent.toLowerCase())?this.html(d.content):(this.getHtmlElement().hide(),this.html(d.content),this.getHtmlElement().fadeIn(400)),a(function(){e.trigger("urlInDivLoaded",[e.getHtmlElement().attr("id")])})):
 alert(d.content);return!1}})(jQuery);(function(a){a.pkp.controllers.ExtrasOnDemandHandler=function(b,c){this.parent(b,c);a(".toggleExtras",b).click(this.callbackWrapper(this.toggleExtras))};a.pkp.classes.Helper.inherits(a.pkp.controllers.ExtrasOnDemandHandler,a.pkp.classes.Handler);a.pkp.controllers.ExtrasOnDemandHandler.prototype.toggleExtras=function(a,c){var d=this.getHtmlElement(),e;c.preventDefault();d.toggleClass("active");d.hasClass("active")&&(e=d.closest(".scrollable"),0<e.size()&&this.scrollToMakeVisible_(d,e))};a.pkp.controllers.ExtrasOnDemandHandler.prototype.scrollToMakeVisible_=
 function(a,c){var d,e,f;d=a.position().top;e=c.position().top;f=parseInt(c.scrollTop(),10);d>e?(d=Math.ceil(d+a.height()-c.height()),0<d&&c.scrollTop(f+d)):(f=Math.max(Math.floor(f+d-e),0),c.scrollTop(f))}})(jQuery);(function(a){a.pkp.controllers.PageHandler=function(a,c){this.parent(a,c);this.bind("redirectRequested",this.redirectToUrl);this.bind("notifyUser",this.redirectNotifyUserEventHandler_);this.bind("redirectDataChangedToGrid",this.redirectDataChangedEventHandler_)};a.pkp.classes.Helper.inherits(a.pkp.controllers.PageHandler,a.pkp.classes.Handler);a.pkp.controllers.PageHandler.prototype.redirectToUrl=function(a,c,d){window.location=d};a.pkp.controllers.PageHandler.prototype.redirectNotifyUserEventHandler_=
 function(b,c,d){!0===d.status?this.getHtmlElement().parent().trigger("notifyUser",[d]):a.pkp.classes.notification.NotificationHelper.redirectNotifyUserEvent(this,d)};a.pkp.controllers.PageHandler.prototype.redirectDataChangedEventHandler_=function(b,c,d){var b=a("a",c.target),e=a.pkp.classes.Handler.getHandler(b).getUrl(),b=a(".pkp_controllers_grid",this.getHtmlElement()).filter(function(){var b=0;a(this).find("a").each(function(){a(this).attr("href")==e&&b++});return 0<b});0<b.length&&b.each(function(){a(this).trigger("dataChanged",
@@ -254,8 +254,9 @@ a.pkp.classes.Handler);a.pkp.controllers.form.MultilingualInputHandler.prototype
 this.isIncomplete_()};a.pkp.controllers.form.MultilingualInputHandler.prototype.showPopover_=function(){var a=this.getHtmlElement();a.addClass("localization_popover_container_focus");a.find(".localization_popover").width(a.width());a.find(".localization_popover").show()};a.pkp.controllers.form.MultilingualInputHandler.prototype.hasElementInFocus_=function(){return this.getHtmlElement().has(document.activeElement).length?!0:!1};a.pkp.controllers.form.MultilingualInputHandler.prototype.isIncomplete_=
 function(){var b=this.getHtmlElement(),c=[],d=0;"undefined"!==typeof tinyMCE&&(this.getHtmlElement().find(".richContent").length?b.find("textarea").each(function(){a(this).attr("id");c.push(a(this));tinyMCE.EditorManager.get(a(this).attr("id")).getContent()&&d++}):(c=b.find(":input"),c.each(function(){a(this).val()&&d++})),0<d&&d<c.length?b.removeClass("localizationComplete").addClass("localizationIncomplete"):d===c.length?b.removeClass("localizationIncomplete").addClass("localizationComplete"):b.removeClass("localizationIncomplete localizationComplete"))};
 a.pkp.controllers.form.MultilingualInputHandler.prototype.tinyMCEInitHandler_=function(){if(this.getHtmlElement().find(".richContent").length&&"undefined"!==typeof tinyMCE){var b=this.getHtmlElement(),c=tinyMCE.EditorManager.get(b.find("textarea").first().attr("id"));c.on("focus",this.callbackWrapper(function(){this.trigger("callWhenClickOutside",{container:this.getHtmlElement(),callback:this.callbackWrapper(this.hidePopover_)});this.showPopover_()}));c.on("blur",this.callbackWrapper(function(){if(a(c.getContainer()).find("iframe").attr("id")==
-a(document.activeElement).attr("id"))return!1;setTimeout(this.callbackWrapper(function(){this.hasElementInFocus_()||this.hidePopover_()}),0)}))}}})(jQuery);(function(a){a.pkp.controllers.form.CancelActionAjaxFormHandler=function(a,c){this.parent(a,c);this.cancelUrl_=c.cancelUrl};a.pkp.classes.Helper.inherits(a.pkp.controllers.form.CancelActionAjaxFormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.form.CancelActionAjaxFormHandler.prototype.cancelUrl_=null;a.pkp.controllers.form.CancelActionAjaxFormHandler.prototype.isComplete_=!1;a.pkp.controllers.form.CancelActionAjaxFormHandler.prototype.containerCloseHandler=function(b,c){!this.isComplete_&&
-null!==this.cancelUrl_&&a.post(this.cancelUrl_);return this.parent("containerCloseHandler",b,c)};a.pkp.controllers.form.CancelActionAjaxFormHandler.prototype.submitForm=function(a,c){this.isComplete_=!0;this.parent("submitForm",a,c)}})(jQuery);(function(a){a.pkp.controllers.form.ThemeOptionsHandler=function(b,c){this.parent(b,c);var d,e,f;d=b.find("#activeThemeOptions");d.length&&(f=this,b.find("#themePluginPath").change(function(){f.unbindPartial(d);d.empty()}),d.find('input[type="color"]').each(function(){var b=a(this);b.spectrum({preferredFormat:"hex",showInitial:!0,showInput:!0,showButtons:!1,change:function(a){e=a.toHexString();b.val(e)}})}))};a.pkp.classes.Helper.inherits(a.pkp.controllers.form.ThemeOptionsHandler,a.pkp.classes.Handler)})(jQuery);(function(a){a.pkp.controllers.form.UserFormHandler=function(b,c){this.parent(b,c);c.fetchUsernameSuggestionUrl&&c.usernameSuggestionTextAlert&&(this.fetchUsernameSuggestionUrl_=c.fetchUsernameSuggestionUrl,this.usernameSuggestionTextAlert_=c.usernameSuggestionTextAlert);a('[id^="suggestUsernameButton"]',b).click(this.callbackWrapper(this.generateUsername));c.hideNonReviewerInterests&&(a('[id^="reviewerGroup-"]',b).click(this.callbackWrapper(this.setInterestsVisibility_)),this.setInterestsVisibility_())};
+a(document.activeElement).attr("id"))return!1;setTimeout(this.callbackWrapper(function(){this.hasElementInFocus_()||this.hidePopover_()}),0)}))}}})(jQuery);(function(a){a.pkp.controllers.form.CancelActionAjaxFormHandler=function(b,c){var d=this;this.parent(b,c);this.cancelUrl_=c.cancelUrl;this.cancelActionHandler=function(){d.handleCancelAction()};a(window).on("unload",this.cancelActionHandler)};a.pkp.classes.Helper.inherits(a.pkp.controllers.form.CancelActionAjaxFormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.form.CancelActionAjaxFormHandler.prototype.cancelActionHandler=null;a.pkp.controllers.form.CancelActionAjaxFormHandler.prototype.cancelUrl_=
+null;a.pkp.controllers.form.CancelActionAjaxFormHandler.prototype.isComplete_=!1;a.pkp.controllers.form.CancelActionAjaxFormHandler.prototype.containerCloseHandler=function(a,c){this.handleCancelAction();return this.parent("containerCloseHandler",a,c)};a.pkp.controllers.form.CancelActionAjaxFormHandler.prototype.submitForm=function(a,c){this.isComplete_=!0;this.parent("submitForm",a,c)};a.pkp.controllers.form.CancelActionAjaxFormHandler.prototype.handleCancelAction=function(){null!==this.cancelActionHandler&&
+(a(window).off("unload",this.cancelActionHandler),this.cancelActionHandler=null);!this.isComplete_&&null!==this.cancelUrl_&&a.post(this.cancelUrl_)}})(jQuery);(function(a){a.pkp.controllers.form.ThemeOptionsHandler=function(b,c){this.parent(b,c);var d,e,f;d=b.find("#activeThemeOptions");d.length&&(f=this,b.find("#themePluginPath").change(function(){f.unbindPartial(d);d.empty()}),d.find('input[type="color"]').each(function(){var b=a(this);b.spectrum({preferredFormat:"hex",showInitial:!0,showInput:!0,showButtons:!1,change:function(a){e=a.toHexString();b.val(e)}})}))};a.pkp.classes.Helper.inherits(a.pkp.controllers.form.ThemeOptionsHandler,a.pkp.classes.Handler)})(jQuery);(function(a){a.pkp.controllers.form.UserFormHandler=function(b,c){this.parent(b,c);c.fetchUsernameSuggestionUrl&&c.usernameSuggestionTextAlert&&(this.fetchUsernameSuggestionUrl_=c.fetchUsernameSuggestionUrl,this.usernameSuggestionTextAlert_=c.usernameSuggestionTextAlert);a('[id^="suggestUsernameButton"]',b).click(this.callbackWrapper(this.generateUsername));c.hideNonReviewerInterests&&(a('[id^="reviewerGroup-"]',b).click(this.callbackWrapper(this.setInterestsVisibility_)),this.setInterestsVisibility_())};
 a.pkp.classes.Helper.inherits(a.pkp.controllers.form.UserFormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.form.UserFormHandler.prototype.fetchUsernameSuggestionUrl_="";a.pkp.controllers.form.UserFormHandler.prototype.usernameSuggestionTextAlert_="";a.pkp.controllers.form.UserFormHandler.prototype.generateUsername=function(b,c){c.preventDefault();var d=this.getHtmlElement(),e,f;f=a('[name="sitePrimaryLocale"]',d).val();e=a('[name="givenName['+f+']"]',d).val();d=a('[name="familyName['+
 f+']"]',d).val();e=this.fetchUsernameSuggestionUrl_.replace("GIVEN_NAME_PLACEHOLDER",e).replace("FAMILY_NAME_PLACEHOLDER",d);a.get(e,this.callbackWrapper(this.setUsername),"json")};a.pkp.controllers.form.UserFormHandler.prototype.setUsername=function(b,c){var d=this.handleJson(c),e=this.getHtmlElement();if(!1===d)throw Error("JSON response must be set to true!");a('[id^="username"]',e).val(d.content).trigger("blur")};a.pkp.controllers.form.UserFormHandler.prototype.setInterestsVisibility_=function(){var b=
 this.getHtmlElement(),c=a("#interests",b);a('[id^="reviewerGroup-"]:checked',b).size()?c.show(300):c.hide(300)}})(jQuery);(function(a){a.pkp.controllers.form.reviewer=a.pkp.controllers.form.reviewer||{};a.pkp.controllers.form.reviewer.ReviewerReviewStep3FormHandler=function(a,c){this.parent(a,c);a.find("[id^='submitFormButton-']").click(this.callbackWrapper(this.updateCommentsRequired_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.form.reviewer.ReviewerReviewStep3FormHandler,a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.form.reviewer.ReviewerReviewStep3FormHandler.prototype.updateCommentsRequired_=function(){var b=
@@ -363,10 +364,9 @@ null;a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler.proto
 c.replaceWith("<ul></ul>"):a(this).append("<ul></ul>")});a("#pkpNavUnassigned > li").each(function(){var b=a(this).children("ul");b.length&&b.find("li").each(function(){a(this).appendTo(a("#pkpNavUnassigned"))});b.remove()});a("#pkpNavManagement ul").sortable({placeholder:"pkp_nav_item_placeholder",delay:250,connectWith:"#pkpNavManagement ul",update:this.callbackWrapper(this.updateSorting),start:function(){a("#pkpNavAssigned").addClass("pkp_is_sorting")},stop:function(){a("#pkpNavAssigned").removeClass("pkp_is_sorting")}})};
 a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler.prototype.updateSorting=function(){var b=a("#pkpNavManagement"),c=0,d="";this.initSorting();a("input",b).remove();a("#pkpNavAssigned > li").each(function(){d="menuTree["+a(this).data("id")+"]";b.append('<input type="hidden" name="'+d+'[seq]" value="'+c+'">');c++;var e=a(this).data("id");a(this).find("li").each(function(){d="menuTree["+a(this).data("id")+"]";b.append('<input type="hidden" name="'+d+'[seq]" value="'+c+'">');b.append('<input type="hidden" name="'+
 d+'[parentId]" value="'+e+'">');c++})})};a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler.prototype.showConditionalDisplayWarning=function(b){var b=a(b).closest("li").data("type"),c={title:this.warningModalTitle_,okButton:this.okButton_,cancelButton:!1,dialogText:this.itemTypeConditionalWarnings_[b]};null!==this.itemTypeConditionalWarnings_[b]&&a('<div id="'+a.pkp.classes.Helper.uuid()+'" class="pkp_modal pkpModalWrapper" tabindex="-1"></div>').pkpHandler("$.pkp.controllers.modal.ConfirmationModalHandler",
-c);return!1};a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler.prototype.showSubmenuWarning=function(){var b={title:this.warningModalTitle_,okButton:this.okButton_,cancelButton:!1,dialogText:this.submenuWarning_};a('<div id="'+a.pkp.classes.Helper.uuid()+'" class="pkp_modal pkpModalWrapper" tabindex="-1"></div>').pkpHandler("$.pkp.controllers.modal.ConfirmationModalHandler",b);return!1}})(jQuery);(function(a){a.pkp.controllers.grid.navigationMenus.form.NavigationMenuItemsFormHandler=function(b,c){this.parent(b,c);this.previewUrl_=c.previewUrl;this.itemTypeDescriptions_=c.itemTypeDescriptions;this.itemTypeConditionalWarnings_=c.itemTypeConditionalWarnings;a("#previewButton",b).click(this.callbackWrapper(this.showPreview_)).hide();a("#menuItemType",b).change(this.callbackWrapper(this.setType));a("#menuItemType",b).trigger("change")};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.navigationMenus.form.NavigationMenuItemsFormHandler,
+c);return!1};a.pkp.controllers.grid.navigationMenus.form.NavigationMenuFormHandler.prototype.showSubmenuWarning=function(){var b={title:this.warningModalTitle_,okButton:this.okButton_,cancelButton:!1,dialogText:this.submenuWarning_};a('<div id="'+a.pkp.classes.Helper.uuid()+'" class="pkp_modal pkpModalWrapper" tabindex="-1"></div>').pkpHandler("$.pkp.controllers.modal.ConfirmationModalHandler",b);return!1}})(jQuery);(function(a){a.pkp.controllers.grid.navigationMenus.form.NavigationMenuItemsFormHandler=function(b,c){this.parent(b,c);this.previewUrl_=c.previewUrl;this.itemTypeDescriptions_=c.itemTypeDescriptions;this.itemTypeConditionalWarnings_=c.itemTypeConditionalWarnings;a("#previewButton",b).click(this.callbackWrapper(this.showPreview_));a("#menuItemType",b).change(this.callbackWrapper(this.setType));a("#menuItemType",b).trigger("change")};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.navigationMenus.form.NavigationMenuItemsFormHandler,
 a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.grid.navigationMenus.form.NavigationMenuItemsFormHandler.prototype.previewUrl_=null;a.pkp.controllers.grid.navigationMenus.form.NavigationMenuItemsFormHandler.prototype.itemTypeDescriptions_=null;a.pkp.controllers.grid.navigationMenus.form.NavigationMenuItemsFormHandler.prototype.itemTypeConditionalWarnings_=null;a.pkp.controllers.grid.navigationMenus.form.NavigationMenuItemsFormHandler.prototype.showPreview_=function(){var b=this.getHtmlElement();
-a.post(this.previewUrl_,b.serialize(),function(a){var b=window.open("about:blank");b.document.open();b.document.write(a);b.document.close()});return!0};a.pkp.controllers.grid.navigationMenus.form.NavigationMenuItemsFormHandler.prototype.setType=function(){var b=a("#menuItemType",this.getHtmlElement()).val(),c=a("#customPageOptions, #previewButton"),d=a("#remoteUrlTarget"),e=a('#menuItemTypeSection [for="menuItemType"]');c.hide();d.hide();"NMI_TYPE_CUSTOM"===b?c.fadeIn():"NMI_TYPE_REMOTE_URL"===b&&
-d.fadeIn();"undefined"!==typeof this.itemTypeDescriptions_[b]&&e.text(this.itemTypeDescriptions_[b])}})(jQuery);(function(a){a.pkp.controllers.grid.representations=a.pkp.controllers.grid.representations||{form:{}};a.pkp.controllers.grid.representations.form.RepresentationFormHandler=function(b,c){this.parent(b,c);(this.remoteRepresentation_=c.remoteRepresentation)?(a("#remotelyHostedContent").prop("checked",!0),a("#remote").show(20)):(a("#remotelyHostedContent").prop("checked",!1),a("#remote").hide(20));a("#remotelyHostedContent").change(this.callbackWrapper(this.toggleRemote_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.representations.form.RepresentationFormHandler,
+a.post(this.previewUrl_,b.serialize(),function(a){var b=window.open("about:blank");b.document.open();b.document.write(a);b.document.close()});return!0};a.pkp.controllers.grid.navigationMenus.form.NavigationMenuItemsFormHandler.prototype.setType=function(){var b=a("#menuItemType",this.getHtmlElement()).val(),c=a('#menuItemTypeSection [for="menuItemType"]');a(".NMI_TYPE_CUSTOM_EDIT",this.getHtmlElement()).hide();a("#"+b).fadeIn();"undefined"!==typeof this.itemTypeDescriptions_[b]&&c.text(this.itemTypeDescriptions_[b])}})(jQuery);(function(a){a.pkp.controllers.grid.representations=a.pkp.controllers.grid.representations||{form:{}};a.pkp.controllers.grid.representations.form.RepresentationFormHandler=function(b,c){this.parent(b,c);(this.remoteRepresentation_=c.remoteRepresentation)?(a("#remotelyHostedContent").prop("checked",!0),a("#remote").show(20)):(a("#remotelyHostedContent").prop("checked",!1),a("#remote").hide(20));a("#remotelyHostedContent").change(this.callbackWrapper(this.toggleRemote_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.representations.form.RepresentationFormHandler,
 a.pkp.controllers.form.AjaxFormHandler);a.pkp.controllers.grid.representations.form.RepresentationFormHandler.prototype.toggleRemote_=function(){a("#remotelyHostedContent").prop("checked")?a("#remote").show(20):(a("#remote").hide(20),a('input[id^="remoteURL"]').val(""));return!0}})(jQuery);(function(a){a.pkp.controllers.grid.settings=a.pkp.controllers.grid.settings||{user:{form:{}}};a.pkp.controllers.grid.settings.user.form.UserDetailsFormHandler=function(b,c){this.parent(b,c);a('[id^="generatePassword"]',b).click(this.callbackWrapper(this.setGenerateRandom));a('[id^="generatePassword"]',b).attr("checked")&&this.setGenerateRandom('[id^="generatePassword"]')};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.settings.user.form.UserDetailsFormHandler,a.pkp.controllers.form.UserFormHandler);
 a.pkp.controllers.grid.settings.user.form.UserDetailsFormHandler.prototype.submitForm=function(b,c){var d=this.getHtmlElement();a(":password",d).removeAttr("disabled");this.parent("submitForm",b,c)};a.pkp.controllers.grid.settings.user.form.UserDetailsFormHandler.prototype.setGenerateRandom=function(b){var b=a(b),c=this.getHtmlElement(),d="",e=0;b.prop("checked")?(d="********",e="disabled"):e=d="";a(":password",c).prop("disabled",e).val(d);a('[id^="sendNotify"]',c).attr("disabled",e).prop("checked",
 e)}})(jQuery);(function(a){a.pkp.controllers.grid.settings.roles=a.pkp.controllers.grid.settings.roles||{form:{}};a.pkp.controllers.grid.settings.roles.form.UserGroupFormHandler=function(b,c){var d=a('[id^="roleId"]',b);this.parent(b,c);c.selfRegistrationRoleIds&&(this.selfRegistrationRoleIds_=c.selfRegistrationRoleIds);c.recommendOnlyRoleIds&&(this.recommendOnlyRoleIds_=c.recommendOnlyRoleIds);this.roleForbiddenStages_=c.roleForbiddenStagesJSON.content;this.stagesSelector_=c.stagesSelector;this.updatePermitSelfRegistration(d.val());
@@ -428,8 +428,8 @@ a(b).prop("name")&&!c.is(":visible"))for(b=0;b<this.possibleRecommendOnlyUserGro
 {title:"",okButton:this.blindReviewerWarningOk_,cancelButton:!1,dialogText:this.blindReviewerWarning_},a('<div id="'+a.pkp.classes.Helper.uuid()+'" class="pkp_modal pkpModalWrapper" tabindex="-1"></div>').pkpHandler("$.pkp.controllers.modal.ConfirmationModalHandler",b)};a.pkp.controllers.grid.users.stageParticipant.form.StageParticipantNotifyHandler.prototype.handleResponse=function(b,c){var d=a("#queriesGrid .pkp_controllers_grid");a.pkp.classes.Handler.hasHandler(d)&&a.pkp.classes.Handler.getHandler(d).trigger("dataChanged");
 return this.parent("handleResponse",b,c)}})(jQuery);(function(a){a.pkp.controllers.grid.users.stageParticipant.form.AddParticipantFormHandler=function(b,c){this.parent(b,c);a("select[name^='filterUserGroupId']",b).change(this.callbackWrapper(this.addUserGroupId));a("input[name='userId']").click(function(){var b=a("input[name='userId']:checked").val();a("input[name='userIdSelected']").val(b).trigger("change")});this.addUserGroupId()};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.users.stageParticipant.form.AddParticipantFormHandler,a.pkp.controllers.form.ClientFormHandler);
 a.pkp.controllers.grid.users.stageParticipant.form.AddParticipantFormHandler.prototype.addUserGroupId=function(){var b=this.getHtmlElement().find("select[name^='filterUserGroupId']").val();a("input[name='userGroupId']").val(b).trigger("change")}})(jQuery);(function(a){a.pkp.pages.reviewer=a.pkp.pages.reviewer||{};a.pkp.pages.reviewer.ReviewerTabHandler=function(a,c){this.parent(a,c);this.reviewStep_=c.reviewStep;this.bind("setStep",this.setStepHandler);this.getHtmlElement().tabs("option","disabled",this.getDisabledSteps(this.reviewStep_))};a.pkp.classes.Helper.inherits(a.pkp.pages.reviewer.ReviewerTabHandler,a.pkp.controllers.TabHandler);a.pkp.pages.reviewer.ReviewerTabHandler.prototype.reviewStep_=null;a.pkp.pages.reviewer.ReviewerTabHandler.prototype.setStepHandler=
-function(a,c,d){this.getHtmlElement().tabs("option","disabled",this.getDisabledSteps(d));this.getHtmlElement().tabs("option","active",d-1)};a.pkp.pages.reviewer.ReviewerTabHandler.prototype.getDisabledSteps=function(a){switch(a){case 1:return[1,2,3];case 2:return[2,3];case 3:return[3];case 4:return[]}throw Error("Illegal review step number.");}})(jQuery);(function(a){a.pkp.pages.authorDashboard=a.pkp.pages.authorDashboard||{};a.pkp.pages.authorDashboard.SubmissionEmailHandler=function(a,c){this.parent(a,c);a.find('a[id^="submissionEmail"]').click(this.callbackWrapper(this.activateAction))};a.pkp.classes.Helper.inherits(a.pkp.pages.authorDashboard.SubmissionEmailHandler,a.pkp.controllers.linkAction.LinkActionHandler)})(jQuery);(function(a){a.pkp.controllers.grid.articleGalleys=a.pkp.controllers.grid.articleGalleys||{};a.pkp.controllers.grid.articleGalleys.ArticleGalleyGridHandler=function(a,c){this.parent(a,c);a.bind("uploadFile",this.callbackWrapper(this.uploadFileHandler_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.articleGalleys.ArticleGalleyGridHandler,a.pkp.controllers.grid.GridHandler);a.pkp.controllers.grid.articleGalleys.ArticleGalleyGridHandler.prototype.uploadFileHandler_=function(b,c,d){setTimeout(function(){a('a[id^="component-grid-articlegalleys-articlegalleygrid-row-'+
-d+'-addFile-button-"]').click()},0)}})(jQuery);(function(a){a.pkp.controllers.grid.issues=a.pkp.controllers.grid.issues||{};a.pkp.controllers.grid.issues.BackIssueGridHandler=function(a,c){this.parent(a,c);this.bindGlobal("issuePublished",this.refreshGridHandler)};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.issues.BackIssueGridHandler,a.pkp.controllers.grid.GridHandler)})(jQuery);(function(a){a.pkp.controllers.grid.issues.FutureIssueGridHandler=function(a,c){this.parent(a,c);this.bindGlobal("issueUnpublished",this.refreshGridHandler)};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.issues.FutureIssueGridHandler,a.pkp.controllers.grid.GridHandler)})(jQuery);(function(a){a.pkp.controllers.tab.issueEntry=a.pkp.controllers.tab.issueEntry||{};a.pkp.controllers.tab.issueEntry.IssueEntryTabHandler=function(a,c){c.selectedGalleyId&&(c.selected=this.getTabPositionByGalleyId_(c.selectedGalleyId,a));this.parent(a,c);this.bind("gridRefreshRequested",this.gridRefreshRequested);c.tabsUrl&&(this.tabsUrl_=c.tabsUrl);c.tabContentUrl&&(this.tabContentUrl_=c.tabContentUrl);this.bind("gridInitialized",this.addGalleysGridRowActionHandlers_);this.publishEvent("gridInitialized")};
+function(a,c,d){this.getHtmlElement().tabs("option","disabled",this.getDisabledSteps(d));this.getHtmlElement().tabs("option","active",d-1)};a.pkp.pages.reviewer.ReviewerTabHandler.prototype.getDisabledSteps=function(a){switch(a){case 1:return[1,2,3];case 2:return[2,3];case 3:return[3];case 4:return[]}throw Error("Illegal review step number.");}})(jQuery);(function(a){a.pkp.pages.authorDashboard=a.pkp.pages.authorDashboard||{};a.pkp.pages.authorDashboard.SubmissionEmailHandler=function(a,c){this.parent(a,c);a.find('a[id^="submissionEmail"]').click(this.callbackWrapper(this.activateAction))};a.pkp.classes.Helper.inherits(a.pkp.pages.authorDashboard.SubmissionEmailHandler,a.pkp.controllers.linkAction.LinkActionHandler)})(jQuery);(function(a){a.pkp.controllers.grid.articleGalleys=a.pkp.controllers.grid.articleGalleys||{};a.pkp.controllers.grid.articleGalleys.ArticleGalleyGridHandler=function(a,c){this.parent(a,c);a.bind("uploadFile",this.callbackWrapper(this.uploadFileHandler_))};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.articleGalleys.ArticleGalleyGridHandler,a.pkp.controllers.grid.GridHandler);a.pkp.controllers.grid.articleGalleys.ArticleGalleyGridHandler.prototype.uploadFileHandler_=function(b,c,d){var e='a[id^="component-grid-articlegalleys-articlegalleygrid-row-'+
+d+'-addFile-button-"]';a.when(a(e)).then(function(){a(function(){a(e).click()})})}})(jQuery);(function(a){a.pkp.controllers.grid.issues=a.pkp.controllers.grid.issues||{};a.pkp.controllers.grid.issues.BackIssueGridHandler=function(a,c){this.parent(a,c);this.bindGlobal("issuePublished",this.refreshGridHandler)};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.issues.BackIssueGridHandler,a.pkp.controllers.grid.GridHandler)})(jQuery);(function(a){a.pkp.controllers.grid.issues.FutureIssueGridHandler=function(a,c){this.parent(a,c);this.bindGlobal("issueUnpublished",this.refreshGridHandler)};a.pkp.classes.Helper.inherits(a.pkp.controllers.grid.issues.FutureIssueGridHandler,a.pkp.controllers.grid.GridHandler)})(jQuery);(function(a){a.pkp.controllers.tab.issueEntry=a.pkp.controllers.tab.issueEntry||{};a.pkp.controllers.tab.issueEntry.IssueEntryTabHandler=function(a,c){c.selectedGalleyId&&(c.selected=this.getTabPositionByGalleyId_(c.selectedGalleyId,a));this.parent(a,c);this.bind("gridRefreshRequested",this.gridRefreshRequested);c.tabsUrl&&(this.tabsUrl_=c.tabsUrl);c.tabContentUrl&&(this.tabContentUrl_=c.tabContentUrl);this.bind("gridInitialized",this.addGalleysGridRowActionHandlers_);this.publishEvent("gridInitialized")};
 a.pkp.classes.Helper.inherits(a.pkp.controllers.tab.issueEntry.IssueEntryTabHandler,a.pkp.controllers.TabHandler);a.pkp.controllers.tab.issueEntry.IssueEntryTabHandler.prototype.tabContentUrl_=null;a.pkp.controllers.tab.issueEntry.IssueEntryTabHandler.prototype.gridRefreshRequested=function(b,c){a(c.target).attr("id").match(/^galleysGridContainer/)&&(this.tabsUrl_&&this.tabContentUrl_)&&(this.getHtmlElement(),a.get(this.tabsUrl_,null,this.callbackWrapper(this.updateTabsHandler_),"json"))};a.pkp.controllers.tab.issueEntry.IssueEntryTabHandler.prototype.updateTabsHandler_=
 function(a,c){var d=this.handleJson(c),e=this.getHtmlElement(),f=e.find("li a"),h={},j=/galley(\d+)/,i,n,k;for(n=0;n<f.length;n++)k=f[n].getAttribute("id"),k=j.exec(k),null!==k&&(h[k[1]]=n);for(i in d.galleys)h.hasOwnProperty(i)||(f=this.tabContentUrl_+"&galleyId="+encodeURIComponent(i),f=f.replace(/[$]/g,"$$$$"),e.tabs("add",f,d.galleys[i]),e.find("li a").filter(":last").attr("id","galley"+i));for(i in h)d.galleys.hasOwnProperty(i)?e.find("li a").filter('[id="galley'+i+'"]').html(d.galleys[i]):e.tabs("remove",
 h[i])};a.pkp.controllers.tab.issueEntry.IssueEntryTabHandler.prototype.addGalleysGridRowActionHandlers_=function(){var b=a('[id^="galleysGridContainer"]',this.getHtmlElement());b.length&&(b=a('a[id*="galleyTab"]',b),b.click(this.callbackWrapper(this.galleysGridLinkClickHandler_)))};a.pkp.controllers.tab.issueEntry.IssueEntryTabHandler.prototype.galleysGridLinkClickHandler_=function(b){var c=a('[id^="galleysGridContainer"]',this.getHtmlElement()).children("div"),c=a.pkp.classes.Handler.getHandler(c),
diff --git a/lib/pkp b/lib/pkp
index 32056e89fba..33423723001 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 32056e89fbaebc58ae375387219f838f025f17f8
+Subproject commit 334237230016e84e8a5bf99d4d65cbccb721a717
diff --git a/locale/fi_FI/default.xml b/locale/fi_FI/default.xml
index 462c4f732d6..906fdcbc3bc 100644
--- a/locale/fi_FI/default.xml
+++ b/locale/fi_FI/default.xml
@@ -172,5 +172,5 @@ Noudata seuraavaa protokollaa tehdessäsi elektronisia korjauksia käsikirjoituk
 	<message key="default.groups.abbrev.externalReviewer">A</message>
 	<message key="default.journalSettings.emailSignature"><![CDATA[<br/>
 ________________________________________________________________________<br/>
-<a href="{$ldelim}$contextUrl{$rdelim}">{$ldelim} $contextName {$rdelim}</a>]]></message>
+<a href="{$ldelim}$contextUrl{$rdelim}">{$ldelim}$contextName{$rdelim}</a>]]></message>
 </locale>
diff --git a/plugins/importexport/crossref/filter/ArticleCrossrefXmlFilter.inc.php b/plugins/importexport/crossref/filter/ArticleCrossrefXmlFilter.inc.php
index 5d9143dd9ff..5c6da6ae074 100644
--- a/plugins/importexport/crossref/filter/ArticleCrossrefXmlFilter.inc.php
+++ b/plugins/importexport/crossref/filter/ArticleCrossrefXmlFilter.inc.php
@@ -117,6 +117,7 @@ function createJournalArticleNode($doc, $submission) {
 				$personNameNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'ORCID', $author->getData('orcid')));
 			}
 			$contributorsNode->appendChild($personNameNode);
+			$isFirst = false;
 		}
 		$journalArticleNode->appendChild($contributorsNode);
 
diff --git a/plugins/themes/default/DefaultThemePlugin.inc.php b/plugins/themes/default/DefaultThemePlugin.inc.php
index 878629b12bd..f2f911554ca 100644
--- a/plugins/themes/default/DefaultThemePlugin.inc.php
+++ b/plugins/themes/default/DefaultThemePlugin.inc.php
@@ -153,8 +153,8 @@ public function init() {
 			$jqueryUI = '//ajax.googleapis.com/ajax/libs/jqueryui/' . CDN_JQUERY_UI_VERSION . '/jquery-ui' . $min . '.js';
 		} else {
 			// Use OJS's built-in jQuery files
-			$jquery = $request->getBaseUrl() . '/lib/pkp/lib/components/jquery/jquery' . $min . '.js';
-			$jqueryUI = $request->getBaseUrl() . '/lib/pkp/lib/components/jquery-ui/jquery-ui' . $min . '.js';
+			$jquery = $request->getBaseUrl() . '/lib/pkp/lib/vendor/components/jquery/jquery' . $min . '.js';
+			$jqueryUI = $request->getBaseUrl() . '/lib/pkp/lib/vendor/components/jqueryui/jquery-ui' . $min . '.js';
 		}
 		// Use an empty `baseUrl` argument to prevent the theme from looking for
 		// the files within the theme directory