Merge pull request #6818 from Dikay900:template_patch
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Tue, 12 Jul 2016 09:35:22 +0000 (09:35 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Tue, 12 Jul 2016 09:35:22 +0000 (09:35 +0000)

Trivial merge