From: Elena Mamontova <helenh463@gmail.com>
Date: Mon, 28 Nov 2016 13:50:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into ticket
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/7332bb3cc272f00359cfdc0628bcc68621665d85?hp=--cc

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

7332bb3cc272f00359cfdc0628bcc68621665d85