Merge branch 'jb/statcolor'