Merge remote-tracking branch 'origin/master' into add-subscription-count

# Conflicts:
#	pusher-websocket-react-native.podspec

Author: proggen