Merge pull request #562 from rursprung/update-to-r2d2-oracle-0.6

Merge pull request #562 from rursprung/update-to-r2d2-oracle-0.6 #413