Merge pull request #3500 from akallabeth/color_conversion_fix_v6
authorMartin Fleisz <martin.fleisz@thincast.com>
Thu, 6 Oct 2016 12:56:26 +0000 (14:56 +0200)
committerGitHub <noreply@github.com>
Thu, 6 Oct 2016 12:56:26 +0000 (14:56 +0200)
Color conversion fix v6


Trivial merge