DynamoDS/Dynamo — pull request #2485 by sharadkjaiswal (2014-09-19 12:02:21+00:00)
Title: Fix cherry-picking conflicts

Cherry picking https://github.com/DynamoDS/Dynamo/pull/2474