pull in changes for 15.3 #8

Closed chazu closed 6 years ago