823b1f Merge branch 'master' into f18

Merged and Committed by Simone Caronni 11 years ago
    Merge branch 'master' into f18