fix build, reported by Denis Fateyev
Merge branch 'master' into portable