Bringing master up to date.

During a merge we lost some updates SubscriptionsManager and AsyncListener included. This pull request does not create new code but restores the one that used to be there, in approved & merged pull requests.

I have noticed this when sending out a new pull request.

Merging this one to have diffstats of the new pull request, with new code, more manageable.

@flipoutbrian : No action required for this pull request.