Travis: Initiating build for commit '87161b37a79887134135cbc6b232f3d39ab3874b' on branch 'DeviceDetector2': Merge branch 'master' into DeviceDetector2

Conflicts:
	core/Tracker/Settings.php
	plugins/API/API.php