CRM-13668 - membership based tokens are inappropriately applying a return limit

http://issues.civicrm.org/jira/browse/CRM-13668
Merge pull request #1874 from dlobo/CRM-13668

CRM-13668 - membership based tokens are inappropriately applying a return limit