Merge pull request #705 from AndersHoglund/fix_the_reds