From 1fcee242dc76228ede84bd4850253eb7fa4cd110 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Mon, 27 Jun 2016 16:00:39 -0700
Subject: [PATCH] Close #311