Sync with master

sync with  twitter/cloudhopper-smpp