#20740: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 24 Feb 2014 18:59:48 +0000 (20:59 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 24 Feb 2014 18:59:48 +0000 (20:59 +0200)

Trivial merge