Fixing bugs with new local server implementation
Autocommit Tue Sep 23 15:09:33 EST 2014