Merge branch '3.8.x'

This commit is contained in:
François Grisez 2015-05-13 17:14:59 +02:00
commit d35fba7be6

@ -1 +1 @@
Subproject commit ceb0f52e88084ceafbb43087c6742a04f4543f88
Subproject commit 2a5bf7675c635945248d5e04428736c85069d773