Commit c3210983a5b466d310dc5af6cc58dec8ad61f02c

Brent Cook 2018-01-07T16:21:11

Land #374, hp-ux compatibility Merge remote-tracking branch 'upstream/pr/374'