f39f1c4 Merge branch 'master' into f23

Merged and Committed by elsupergomez 8 years ago
    Merge branch 'master' into f23