Merge remote-tracking branch 'upstream/master'
merge du 11 06 14

Merge branch 'master' of https://github.com/ludovicpe/chest