Merge branch 'newgrf-property-mapping' into jgrpp

This commit is contained in:
Jonathan G Rennison
2018-11-22 19:29:53 +00:00