Merge latest changes for moved MendeleyLoginWindowController