rjrjr Merge pull request #285 from square/ray/deprecation