Added by Iustin Pop over 12 years ago
Merge branch 'devel-2.3'
Signed-off-by: Iustin Pop <iustin@google.com>Reviewed-by: Michael Hanselmann <hansmi@google.com>