add call to do a composer self-update
Merge branch 'refs/heads/master' into 2.1