tree fc781d54db2f173114c21ba444d92c985853ca11
parent 4c935660a4d75fca9371bce5665ffdd911e7db86
parent 5f7c69bba07a7155adde130d9dee2e54a54f1fa5
author Tatu Saloranta <tatu.saloranta@iki.fi> 1560482834 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> 1560482834 -0700

Merge branch '2.7' into 2.8