Better ci detection based on correct ip.
Merge remote-tracking branch 'origin/master'