Fixing issue #583
Updating composer
Happy new year!
Final changes for 3.1.5