Merge "Example as code, documentation template for sphinx build"
authorTrevor Cooper <trevor.cooper@intel.com>
Fri, 15 Jan 2016 21:08:57 +0000 (21:08 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 15 Jan 2016 21:08:58 +0000 (21:08 +0000)

Trivial merge