Merge branch 'master' into 6279-web-shell-client
authorradhika <radhika@curoverse.com>
Wed, 8 Jul 2015 18:46:22 +0000 (14:46 -0400)
committerradhika <radhika@curoverse.com>
Wed, 8 Jul 2015 18:46:22 +0000 (14:46 -0400)

Trivial merge