Place nice with GCC
Merge branch 'chi-new'