Back Merge changes for OverDrive APIs

OverDrive APIs ready for production usage
Also merges some bug fixes
Merge remote-tracking branch 'origin/2013.05.2' into 2013.06.0