merged from release-5-3-1
merged from release-5-3-1
merged from release-5-3-2
Merge pull request #60 from kkronenb/master

sync git with svn