ORA2 release-2014-07-28T12.09

@stephensanchez 

@flowerhack I'm hoping to get this into the RC today, will merge as soon as tests pass.  Would it be possible to hold off cutting the RC until this is merged?