Don't delete files so that we can take a look at them for troubleshooting.
Merge remote-tracking branch 'origin/API-20140530-sqlite3' into API-20140530-sqlite3