Travis: Initiating build for commit '70ad6070a802691533d37cb03abcc8afe690e4de' on branch 'DeviceDetector2': Merge branch 'master' into DeviceDetector2

Conflicts:
	plugins/DevicesDetection/DevicesDetection.php