backup branch

[SVN r72617]
pedantic warning fixed

[SVN r72621]