Fixing bugs with new local server implementation
Autocommit Tue Sep 23 14:50:32 EST 2014