From: Elena Mamontova <helenh463@gmail.com>
Date: Fri, 21 Oct 2016 11:17:02 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into ticket
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/d1ddf1df6b8987cc1be7dc96608e22998c3e9cb6?ds=sidebyside;hp=-c

Merge remote-tracking branch 'origin/master' into ticket
---

d1ddf1df6b8987cc1be7dc96608e22998c3e9cb6