[xvst/f31] Update to recent git version 3.0-7.20180822git3ae2797