From: Michael D. Lowis <mike.lowis@gentex.com>
Date: Tue, 30 May 2017 12:29:29 +0000 (-0400)
Subject: Merge branch 'master' into testing
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=b5e198a8496bb7cbfd6906150e4e3a189a715271;p=projs%2Ftide.git

Merge branch 'master' into testing
---

b5e198a8496bb7cbfd6906150e4e3a189a715271