Merge branch 'pullfix' of https://github.com/glogiotatidis/docker-py into glogiotatidis-pullfix

Conflicts:
	docker/client.py

Author: shin-

docker/client.py

@@ -306,7 +306,7 @@ def attach_socket(self, container, params=None, ws=False):
 
     def build(self, path=None, tag=None, quiet=False, fileobj=None,
               nocache=False, rm=False, stream=False, timeout=None,
-              custom_context=False, encoding=None, pull=True,
+              custom_context=False, encoding=None, pull=False,
               forcerm=False, dockerfile=None, container_limits=None,
               decode=False):
         remote = context = headers = None
@@ -353,6 +353,9 @@ def build(self, path=None, tag=None, quiet=False, fileobj=None,
                 'dockerfile was only introduced in API version 1.17'
             )
 
+        if utils.compare_version('1.19', self._version) < 0:
+            pull = 1 if pull else 0
+
         u = self._url('/build')
         params = {
             't': tag,