c07846a Merge branch 'master' into f17

Merged and Committed by caolanm 12 years ago
    Merge branch 'master' into f17