Merge remote-tracking branch 'origin/master'

git-svn-id: https://roadrunnerlib.googlecode.com/svn/trunk@1338 c0027639-9190-0b57-01eb-f09a03790dae