Updated OkHttp dependency version to 1.6.0
Restarting Travis build.
OkHttp module upgraded to the dependency's 2.0.0 version. Code changes due to changed API.
Reverted OkHttp dependency to 1.6.0, but now using an API that can be forced to use 2.0.0 immediately.
Restarting Travis build.
Merge remote-tracking branch 'origin/master' into PR259

Conflicts:
	.change_me_to_restart_travis.txt