DynamoDS/Dynamo — pull request #3183 by Benglin (2014-11-18 18:06:18+00:00)
Title: Cross merging master changes into release branch

Please see [the original pull request](https://github.com/DynamoDS/Dynamo/pull/3139) for review details.