Merge branch 'master' into 3654-combine-selections
authorradhika <radhika@curoverse.com>
Fri, 12 Sep 2014 17:26:37 +0000 (13:26 -0400)
committerradhika <radhika@curoverse.com>
Fri, 12 Sep 2014 17:26:37 +0000 (13:26 -0400)

Trivial merge