WIP.
Merge remote-tracking branch 'origin/API-20140530-sqlite3' into API-20140530-sqlite3