Merge branch '1.3' into 2.0

This commit is contained in:
Christophe Coevoet
2014-01-31 00:07:24 +01:00