Merge branch 'master' into 2767-doc-updates
authorradhika <radhika@curoverse.com>
Mon, 12 May 2014 00:30:59 +0000 (20:30 -0400)
committerradhika <radhika@curoverse.com>
Mon, 12 May 2014 00:30:59 +0000 (20:30 -0400)

Trivial merge