Activities PR for paris2013 branch. Same as master PR.