Merge remote-tracking branch 'refs/remotes/Itseez/master'
authorElad Joseph <eladjoseph@hotmail.com>
Mon, 29 Feb 2016 19:48:30 +0000 (21:48 +0200)
committerElad Joseph <eladjoseph@hotmail.com>
Mon, 29 Feb 2016 19:48:30 +0000 (21:48 +0200)

Trivial merge