Benglin/Dynamo — pull request #213 by vmoyseenko (2014-11-19 15:57:19+00:00)
Title: Merge conflict fix

Merge conflict fix.

@Benglin, please, take a look