Merge pull request #986 from algernon/f/riemann/rcc