Merge branch 'master' into 3637-copy-selections
authorradhika <radhika@curoverse.com>
Thu, 28 Aug 2014 19:20:03 +0000 (15:20 -0400)
committerradhika <radhika@curoverse.com>
Thu, 28 Aug 2014 19:20:03 +0000 (15:20 -0400)

Trivial merge