Merged default into minor

--HG--
branch : minor

src/modules/image/wrap_ImageData.cpp

@@ -164,7 +164,7 @@ int w_ImageData__mapPixelUnsafe(lua_State *L)
 			lua_pushvalue(L, 2);
 			lua_pushnumber(L, x);
 			lua_pushnumber(L, y);
-			pixel c = t->getPixel(x, y);
+			pixel c = t->getPixelUnsafe(x, y);
 			lua_pushnumber(L, c.r / 255.0);
 			lua_pushnumber(L, c.g / 255.0);
 			lua_pushnumber(L, c.b / 255.0);