Merge pull request #6508 from nicolasnoble/master-sync

Master sync