Travis: Initiating build for commit 'c9fac0a8af1a3bf2666ceb4d368cb9f2aaced65c' on branch 'log-refactoring-1': Merge branch 'master' into log-refactoring-1

Conflicts:
	CHANGELOG.md