Merge remote-tracking branch 'github-octo/pyr/riemann' into pyr/riemann