Merge branch 'master' into 2985-selection-button-move-copy
authorradhika <radhika@curoverse.com>
Wed, 30 Jul 2014 19:43:51 +0000 (15:43 -0400)
committerradhika <radhika@curoverse.com>
Wed, 30 Jul 2014 19:43:51 +0000 (15:43 -0400)

Trivial merge