Merge master
Note which ENV vars are required