merge changes from yahoo/storm-yran