Typos only
Hopefully changing the spelling of the error message doesn't break any clients
Merge pull request #685 from eric-wu/release-13

Fix data migration issues with DOI and TrashCan
Merge pull request #670 from kaysoky/NotSureWhyThisHasntBeenDoneYet

Fix some typos
Fix Hudson build failure.
Merge pull request #690 from eric-wu/quickfix

Fix Hudson build failure.
Merge branch 'release-13' into develop