mathias-arm Merge pull request #611 from gbryant-arm/vod-ci