From: Elena Mamontova <helenh463@gmail.com>
Date: Thu, 19 Jan 2017 14:00:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into ticket
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/6c4d31bf18078de98e71575d4b032df303f23a3a

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

6c4d31bf18078de98e71575d4b032df303f23a3a