Merge branch 'master' into 3141-keep-logging-improvements
authorWard Vandewege <ward@curoverse.com>
Wed, 2 Jul 2014 13:51:00 +0000 (09:51 -0400)
committerWard Vandewege <ward@curoverse.com>
Wed, 2 Jul 2014 13:51:00 +0000 (09:51 -0400)

Trivial merge