Merged from github.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2018-05-06 09:45:54
Author local date 2018-05-06 11:45:54 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2018-05-06 09:45:54
Committer local date 2018-05-06 11:45:54 +0200
Commit 49e31c08b06ffc81abb258642be962bf7d574d63
Tree a8e4bfcdb002f9ee2484f4ab75e71e6d7395831a
Parent 7f44fce5a478614fa810ba196cab30227101445e
Parent fe77c9f0053671431f6e521adb6b0b40f01fca58
Merged from github.
ViewGit