Merge branch 'master' into 2352-remove-attrs
authorradhika <radhika@curoverse.com>
Sat, 10 May 2014 00:22:26 +0000 (20:22 -0400)
committerradhika <radhika@curoverse.com>
Sat, 10 May 2014 00:22:26 +0000 (20:22 -0400)

Trivial merge