Merge pull request #6407 from StevenPuttemans:fix_ts_perf_warnings
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 14 Apr 2016 14:27:27 +0000 (14:27 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 14 Apr 2016 14:27:27 +0000 (14:27 +0000)

Trivial merge