rsim/oracle-enhanced — pull request #379 by yahonda (2013-11-30 17:41:42+00:00)
Title: Backport #378 to release14 branch

This pull request backports #378 into release14 branch.