Merge pull request #5421 from petersalomonsen/examples-fixes-and-additions examples: additions and fixes
2020-04-04T13:36:24