Merge pull request #5349 from lupustr3:pvlasov/tls_update
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 18 Sep 2015 14:39:08 +0000 (14:39 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 18 Sep 2015 14:39:08 +0000 (14:39 +0000)

Trivial merge