Merge pull request #3304 from eltermann:master
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Tue, 7 Oct 2014 07:35:58 +0000 (07:35 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Tue, 7 Oct 2014 07:35:59 +0000 (07:35 +0000)

Trivial merge