Merge pull request #3580 from JoeHowse:master
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 5 Jan 2015 19:40:37 +0000 (19:40 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 5 Jan 2015 19:40:37 +0000 (19:40 +0000)

Trivial merge