Merge branch 'master' into sfa-geni-v3
Thierry Parmentelat [Wed, 17 Apr 2013 11:46:12 +0000 (13:46 +0200)]

Trivial merge