Merge pull request #4829 from totten/master-composer