Merge branch 'master' into 9514-delete-old-container-logs
authorradhika <radhika@curoverse.com>
Wed, 21 Sep 2016 00:01:44 +0000 (20:01 -0400)
committerradhika <radhika@curoverse.com>
Wed, 21 Sep 2016 00:01:44 +0000 (20:01 -0400)

Trivial merge