svn merge

git-svn-id: https://roadrunnerlib.googlecode.com/svn/branches/develop@1324 c0027639-9190-0b57-01eb-f09a03790dae