Merge pull request #4 from kkronenb/release-5-3

sync svn with git r44413 to r44712
Merge pull request #10 from kkronenb/release-5-3

svn to git update r44712 to 45029