Merge branch 'master' into 4194-keep-logging
authorradhika <radhika@curoverse.com>
Mon, 17 Nov 2014 22:27:30 +0000 (17:27 -0500)
committerradhika <radhika@curoverse.com>
Mon, 17 Nov 2014 22:27:30 +0000 (17:27 -0500)

Trivial merge