tree a5ab3ead24db723f4125e960af9648a673c07db8
parent f4f4a4e035ada20a532a5400e5f093a5a575a0ed
parent 41b7f9b90149e9d44a65a8261a8deedc7186f6af
author Tatu Saloranta <tatu.saloranta@iki.fi> 1568959126 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1568959126 -0700

Merge branch '2.8' into 2.9 (fix #2462)