[MERGE] forward port branch saas-6 up to 5065f4b3e8

doc/cla/individual/jirizatloukal.md

@@ -0,0 +1,11 @@
+The Czech Republic, 18.01.2017
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Jiri Zatloukal zatloukal@apitea.com  https://github.com/jirizatloukal

openerp/tools/image.py

@@ -214,7 +214,7 @@ def image_colorize(original, randomize=True, color=(255, 255, 255)):
     # generate the background color, past it as background
     if randomize:
         color = (randrange(32, 224, 24), randrange(32, 224, 24), randrange(32, 224, 24))
-    image.paste(color)
+    image.paste(color, box=(0, 0) + original.size)
     image.paste(original, mask=original)
     # return the new image
     buffer = StringIO.StringIO()