Merge branch 'hotfix/1.1.11' v1.1.11
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Mar 2017 14:17:43 +0000 (09:17 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Mar 2017 14:17:43 +0000 (09:17 -0500)

Trivial merge