Merge branch 'hotfix/1.1.10' v1.1.10
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Oct 2016 16:42:04 +0000 (12:42 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 21 Oct 2016 16:42:04 +0000 (12:42 -0400)

Trivial merge