From: Mike Lowis <mike.lowis@gentex.com>
Date: Mon, 26 Sep 2016 12:27:26 +0000 (-0400)
Subject: Merged changes from upstream
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=0b920ee434207703ec934f9067be90c0405bf98b;p=projs%2Ftide.git

Merged changes from upstream
---

0b920ee434207703ec934f9067be90c0405bf98b