Move MapBlock (de)serializing code out of Database class
Fix crash reported here: https://forum.minetest.net/viewtopic.php?f=6&t=9726
Fix android build after removal of indev and math mapgen
Add srollbar formspec element
Fix flipped textures for drawtype "glasslike"
Fix indexing error in timer processing
Permit non-integer sizes for item_image[]
Make tooltip_show_delay=0 work
Fix error handling on inconsistent client ready message
Fix android makefile to provide a correct dummy githash if detection fails
Fix texture hack in fences.
Fix texture glitches for plants with visual scale > 1.0 (jungle grass).
Speedup mapblock_mesh
Remove vector assertions

These were initially added to get tracebacks for invalid vector errors, but it
didn't work and tracebacks have since been properly fixed in the core.
Bugfix in makeCuboid - apply rotations to all faces when 1 tile is given.
Add rotation for plantlike drawtype.
Merge commit 'eec456b'

Conflicts:
	src/database-dummy.cpp
	src/database-leveldb.cpp
	src/database-redis.cpp
	src/database-sqlite3.cpp
	src/main.cpp
	src/map.cpp
	src/map.h
Merge remote-tracking branch 'minetest/master'

Conflicts:
	builtin/game/misc.lua
	src/nodedef.cpp
	src/server.cpp
Revert "Fix android build after removal of indev and math mapgen"

This reverts commit 903d343b08df17c88eafdd698af5b9f73ef6e389.
Light fixes
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	src/guiFormSpecMenu.h