Add es
Merge branch 'master' of https://github.com/darktable-org/darktable
Merge branch 'master' of https://github.com/darktable-org/darktable
Merge branch 'master' of https://github.com/darktable-org/darktable
Better fix for gradient slider. This replaces 5e57fafa0d78
Coverity CID 1034359
Limit the thumbnail cache sizes to 640x480 max
Merge branch 'master' of https://github.com/darktable-org/darktable
Fix multiple (potential?) memleaks in masks. Anything broken?
Coverity CID 1125109, CID 1125110, CID 1147481, CID 1147482, CID 1147483, CID 1147484, CID 1147485, CID 1147486, CID 1147487, CID 1147488, CID 1147489
Fix the broken build
Merge branch 'master' of https://github.com/darktable-org/darktable
Some more sizeof
highlights: color interpolation, thanks to a1ex from magic lantern!

will get color in highlights, works nicely on skin.

use with edge threshold > 0 in demosaic for some nice color smoothing, avoids most of the mazing artifacts that still remain.
Update French translation.
highlights: no OpenCL yet for color interpolation mode
Unbreak gcc-4.6 and cmake builds
Has been broken by ce8265ede245f14e3067f81c9a1dd492d2ac04c3 and 850ceb003f00c55d388751ac4419b77064687a7e
Pixelpipe rework: allow iops to specify from what pipe to compute histogram
Pixelpipe rework: move histogram_collect*() calls before process*()
Italian translation updated
Deduplicate dt_dev_pixelpipe_type_t definition
highlights: fix nan issue with dead pixels.