Merge pull request #6208 from alalek:templates
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 10 Mar 2016 11:35:30 +0000 (11:35 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Thu, 10 Mar 2016 11:35:30 +0000 (11:35 +0000)

Trivial merge