Merge branch 'master' into 3055-advanced-tab-explanations
authorradhika <radhika@curoverse.com>
Thu, 3 Jul 2014 20:46:30 +0000 (16:46 -0400)
committerradhika <radhika@curoverse.com>
Thu, 3 Jul 2014 20:46:30 +0000 (16:46 -0400)

Trivial merge