Merge branch 'hotfix/1.1.9' v1.1.9
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 14:12:40 +0000 (09:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 14:12:40 +0000 (09:12 -0500)

Trivial merge