Merge tag '1.11.0-beta1' into jgrpp

# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp

media/baseset/openttd/openttdgui.nfo

@@ -4,7 +4,7 @@
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 //
    -1 * 0	 0C "OpenTTD GUI graphics"
-   -1 * 3	 05 15 \b 184 // OPENTTD_SPRITE_COUNT
+   -1 * 3	 05 15 \b 186 // OPENTTD_SPRITE_COUNT
    -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
    -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
@@ -189,3 +189,5 @@
    -1 sprites/openttdgui_convert_road.png 8bpp  24   0  32  32   0   0 normal
    -1 sprites/openttdgui_convert_tram.png 8bpp   0   0  20  20   0   0 normal
    -1 sprites/openttdgui_convert_tram.png 8bpp  24   0  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 513  440  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 526  440  10  10   0   0 normal