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

Trivial merge