Merge
Merge github.com:CChiappa/darktable