Merge branch 'master' into 3654-combine-selections
authorradhika <radhika@curoverse.com>
Sat, 6 Sep 2014 19:53:17 +0000 (15:53 -0400)
committerradhika <radhika@curoverse.com>
Sat, 6 Sep 2014 19:53:17 +0000 (15:53 -0400)

Trivial merge