Merge branch 'master' of https://github.com/opensourceautomation/Open-Source-Automation

Conflicts:

Former-commit-id: 52c650146b807253d56623a50fa25b2dafed787b