From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 20 Feb 2017 22:58:15 +0000 (-0500)
Subject: Merge pull request #1956 from bdarnell/master
X-Git-Tag: v4.5.0~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=624f5d4fb2ad7b37876b3bfe447f5755a3c25d71;p=thirdparty%2Ftornado.git

Merge pull request #1956 from bdarnell/master

Misc updates
---

624f5d4fb2ad7b37876b3bfe447f5755a3c25d71