Merge branches 'tags-simplify-recursion' and 'color-tests-always'