Revert "Run composer self-update to solve travis issues."

This reverts commit c838df267d5721c0c6b9d201dca302a9a0ed36ae.
Merge branch 'devel'