Commit 17fa9f714f9a211f987a337823d4c1eed4956233

Werner Lemberg 2016-07-12T08:06:23

Merge branch '2.6.5'.