Thu, 16 Feb 2017 14:35:12 +0500Merge
PaulBeltyukov [Thu, 16 Feb 2017 14:35:12 +0500] rev 1649
Merge

Thu, 16 Feb 2017 14:34:40 +0500Safe
PaulBeltyukov [Thu, 16 Feb 2017 14:34:40 +0500] rev 1648
Safe