Merge pull request #798 from leider/master

More cleanup in activityresults
Merge commit '0d6f30460535fcd60fc2a36db6762326f9350a3c'