From: Branden Archer <b.m.archer4@gmail.com>
Date: Wed, 3 May 2017 16:04:14 +0000 (-0400)
Subject: Merge branch 'master' into cmake-gitignore
X-Git-Tag: 0.12.0~9^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=632db821cf45321e63293c13c3a34f432001c64a;p=check

Merge branch 'master' into cmake-gitignore
---

632db821cf45321e63293c13c3a34f432001c64a