Merge branch 'hotfix/1.1.6' v1.1.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:42:41 +0000 (11:42 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:42:41 +0000 (11:42 -0400)

Trivial merge