Applying patch to fix subscription count logic, https://drupal.org/node/2203641.
Merge commit 'fd2c7fd6f7d40ffe726d2f12b9c7694e452e4d2b' into local

* commit 'fd2c7fd6f7d40ffe726d2f12b9c7694e452e4d2b':
  Applying patch to fix subscription count logic, https://drupal.org/node/2203641.