Merge branch 'master' into sandbox/vbarinov/multiarch sandbox/vbarinov/multiarch
authorSlava Barinov <v.barinov@samsung.com>
Wed, 22 Mar 2017 09:53:41 +0000 (12:53 +0300)
committerSlava Barinov <v.barinov@samsung.com>
Wed, 22 Mar 2017 09:53:41 +0000 (12:53 +0300)

Trivial merge