Merge branch '3.7'

This commit is contained in:
Romain Neutron
2013-02-01 09:29:18 +01:00