Merged 3.6 into 3.7-beta manually

This commit is contained in:
badlogic 2017-07-12 10:55:02 +02:00
commit 2ba07148cd