Merge branch 'master' into jgrpp

# Conflicts:
#	src/network/core/tcp_connect.cpp

src/signs_gui.cpp

@@ -565,10 +565,14 @@ static WindowDesc _query_sign_edit_desc(
  */
 void HandleClickOnSign(const Sign *si)
 {
+	/* If we can't rename the sign, don't even open the rename GUI. */
+	if (!CompanyCanRenameSign(si)) return;
+
 	if (_ctrl_pressed && (si->owner == _local_company || (si->owner == OWNER_DEITY && _game_mode == GM_EDITOR))) {
 		RenameSign(si->index, nullptr);
 		return;
 	}
+
 	ShowRenameSignWindow(si);
 }