Merge from javalite/activejdbc