Merge the result of the docs sprint back into master. Change-Id: I30161f4bfc30a14b2d55dae1bc13f5396217d6b7