Merge branch 'gdevelop' into gfeature-llvm

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