Merge branch 'master' into 6279-web-shell-client
authorradhika <radhika@curoverse.com>
Thu, 9 Jul 2015 00:26:23 +0000 (20:26 -0400)
committerradhika <radhika@curoverse.com>
Thu, 9 Jul 2015 00:26:23 +0000 (20:26 -0400)

Trivial merge