Merge branch 'master' into 2767-doc-updates
authorradhika <radhika@curoverse.com>
Fri, 9 May 2014 13:49:14 +0000 (09:49 -0400)
committerradhika <radhika@curoverse.com>
Fri, 9 May 2014 13:49:14 +0000 (09:49 -0400)

Trivial merge