From: Vladimir Svyatski <v.unreal@gmail.com>
Date: Wed, 27 Apr 2016 20:50:27 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: Release_414~55^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=188ae3d0bee6c8b73a2c6e93e43a38a6865cab05;p=lamexp%2FLameXP.git

Merge remote-tracking branch 'upstream/master'
---

188ae3d0bee6c8b73a2c6e93e43a38a6865cab05