Merge branch '11226-discovery-doc-cache' closes #11226
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 9 Mar 2017 19:44:26 +0000 (14:44 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 9 Mar 2017 19:44:26 +0000 (14:44 -0500)

Trivial merge