sync with atomic-pool
Merge branch 'master' of https://github.com/racarone/Sparrow-S

Conflicts:
sparrow/src/Classes/SPPoolObject.m
merge conflict