Merge branch '3141-keep-logging-improvements'
authorWard Vandewege <ward@curoverse.com>
Fri, 4 Jul 2014 02:30:44 +0000 (22:30 -0400)
committerWard Vandewege <ward@curoverse.com>
Fri, 4 Jul 2014 02:30:44 +0000 (22:30 -0400)
This closes #3141


Trivial merge