Merge commit 'c3352315d3563a201433837b0932bba249344f67' into dev
authorkhizmax <khizmax@gmail.com>
Tue, 15 Nov 2016 07:19:09 +0000 (10:19 +0300)
committerkhizmax <khizmax@gmail.com>
Tue, 15 Nov 2016 07:19:09 +0000 (10:19 +0300)

Trivial merge