Merge pull request #1 from scalding/OR-419

Or 419