49b63ca Merge branch 'master' into f20

Merged and Committed by leigh123linux 10 years ago
    Merge branch 'master' into f20