Merge branch 'master' into swift-2

* master:
  use computed variable for sid
This commit is contained in:
Erik 2015-06-19 09:24:15 -04:00
commit f41b64137e

Diff Content Not Available