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

Conflicts:
	CHANGELOG.md