Hope to pass tests
Merge Callek/build-relengapi:issue-36 (PR #47)