From cbca811521e709452b869b4aff80e010efe76e69 Mon Sep 17 00:00:00 2001
From: Brett Andrews <brett.j.andrews@gmail.com>
Date: Mon, 27 Aug 2018 12:50:36 -0700
Subject: [PATCH] chore: merge master back into develop (#178)