Merge branch 'hotfix/2.1.7' v2.1.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Jun 2016 12:44:49 +0000 (08:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Jun 2016 12:44:49 +0000 (08:44 -0400)

Trivial merge