Merge branch 'master' into 4250-doc-updates
authorradhika <radhika@curoverse.com>
Tue, 18 Nov 2014 19:16:54 +0000 (14:16 -0500)
committerradhika <radhika@curoverse.com>
Tue, 18 Nov 2014 19:16:54 +0000 (14:16 -0500)

Trivial merge