Merge pull request #9011 from jernic/jernic-patch-1
authorMonish Deb <monish.deb@webaccessglobal.com>
Tue, 18 Oct 2016 07:13:27 +0000 (12:43 +0530)
committerGitHub <noreply@github.com>
Tue, 18 Oct 2016 07:13:27 +0000 (12:43 +0530)
Select correct activity if more than one in upcoming or recent period


Trivial merge