Merge branch 'excludes-doc'
Samuel Kaufman [Wed, 20 Sep 2017 20:53:56 +0000 (20:53 +0000)]

Trivial merge