Ensure composer updates when running in travis.
Merge branch 'travis' into develop