Forwardport the changes made in the 4.7 branch
author Luca Beltrame
()
committer Luca Beltrame
()
commit 27e5d9e0b70274f02a7c5b5324aa3e13801715f9
tree ba6d522aa86744d5128e3f4b30692fc9820ba34e
parent 8ef4ca9e557e7fc6cc2a3a35ddeb3cf8dcee6736
parent 54374be42eb89608c5c536fa29004487b1d702e3
Forwardport the changes made in the 4.7 branch