6cf883e Merge branch '435-photon-recombination-needs-to-include-photons-in-recombined-subevent' into 'master'