Merge branch 'master' into 2767-doc-updates
authorradhika <radhika@curoverse.com>
Thu, 22 May 2014 15:21:53 +0000 (11:21 -0400)
committerradhika <radhika@curoverse.com>
Thu, 22 May 2014 15:21:53 +0000 (11:21 -0400)

Trivial merge