Merge branch 'master' into sfa-geni-v3
Thierry Parmentelat [Tue, 25 Jun 2013 07:17:21 +0000 (09:17 +0200)]

Trivial merge