Merge pull request #745 from sourcepirate/patch-2

Updated activation.cc