Add composer-module and monolog-module
Merge branch 'develop' into 2.1
Merge remote-tracking branch 'upstream/2.1' into 2.1

Conflicts:
	composer.lock