Benglin/Dynamo — pull request #214 by vmoyseenko (2014-11-19 16:14:22+00:00)
Title: Merge conflict resolution. Sitrus2015 branch

Merge conflict resolution. Sitrus2015 branch.

@Benglin, please, take a look.