Renamed the log tag as it was too long
Merge remote-tracking branch 'soundcloud/development' into development

Conflicts:
	gradle.properties