Merge pull request #6382 from StevenPuttemans:update_annotation_tool
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Wed, 13 Apr 2016 10:05:25 +0000 (10:05 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Wed, 13 Apr 2016 10:05:26 +0000 (10:05 +0000)

Trivial merge