#26246: merge with 3.4.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 27 Feb 2016 06:41:16 +0000 (08:41 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 27 Feb 2016 06:41:16 +0000 (08:41 +0200)
commit738f88f688b7e490725bdcc9186a888998ca0370
tree3931504650da3a98dd0d1165108ca6482ada3d30
parent5d9413404017a829aa5ddb52be6019fb63ec5c09
parent90ba2ca68a829991c0797fc27a26f2e697afa5e7
#26246: merge with 3.4.
Misc/ACKS