Merge "addendum to prior change for github compatibility"