Merge "Don't cache colorMap pointer." into devel/master