Merge branch 'master' into 3654-combine-selections
authorradhika <radhika@curoverse.com>
Thu, 4 Sep 2014 20:58:51 +0000 (16:58 -0400)
committerradhika <radhika@curoverse.com>
Thu, 4 Sep 2014 20:58:51 +0000 (16:58 -0400)

Trivial merge