From: Branden Archer <b.m.archer4@gmail.com>
Date: Tue, 13 Dec 2016 02:52:08 +0000 (-0500)
Subject: Merge branch 'master' into news-update
X-Git-Tag: 0.11.0~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=226335442c23bea0ad1b2e5d55b63590b130f735;p=check

Merge branch 'master' into news-update
---

226335442c23bea0ad1b2e5d55b63590b130f735