TOOLS-2429
Merge branch 'master' of https://github.com/lsdeva/developer-studio