Merge 2.4 into master

Original pull requests:

* #44 from jet47:gpu-sanity-test-fix
* #45 from jet47:cuda-5.5-support
* #48 from jet47:gpu-sanity-test-name
* #50 from alekcac:2.4
* #51 from rdm12:bugfix_3121_cvtcolor