Merge branch 'hotfix/2.1.2' v2.1.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Jul 2017 12:44:35 +0000 (08:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Jul 2017 12:44:35 +0000 (08:44 -0400)

Trivial merge