Merge remote-tracking branch 'jpountz/master'