Merge branch 'hotfix/1.1.16' v1.1.16
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 16:03:28 +0000 (12:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 16:03:28 +0000 (12:03 -0400)

Trivial merge