Adding / fixing logging.
Better commit log.
Abbreviated commit.
Merge branch 'master' into resharding