Merge pull request #3553 from techee/colorize_fix