Import aa3b4dd515: Merge remote-tracking branch 'origin/master' (by Caitlyn)

[daleglass]

This is an automated proposal to look at a commit made by Caitlyn and import it into Overte

Commit:	aa3b4dd515d6ed6de1ebe2869434910061006cad
Author:	Caitlyn
Date:	Tue, 28 Apr 2020 12:59

Merge remote-tracking branch 'origin/master'

Stats:

Filename	Stats	Lines	Added	Removed	Lines in blame
tools/shadergen.py		2	1	1	⚠ 0
1 files	-	2	1	1	0

To work on this, please assign the issue to yourself, then look at the commit and decide whether this would be a good addition to Overte.

• If the commit is useful, tag it with "Tivoli: Keep", and keep it open until it's merged.
• If the commit is not useful, tag it with "Tivoli: Discard", and close it.
• If the commit is not useful right now, but might be later, tag it with "Tivoli: Maybe later", and close it.
• If it's hard to decide, tag it with "Tivoli: Discuss", and keep it open.

Useful commits should be submitted as a PR against Overte. Tag this issue in PR, so that it's automatically closed once the PR is merged.

You can cherry-pick this issue with this command:

git cherry-pick aa3b4dd515d6ed6de1ebe2869434910061006cad