Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Aug 2016 16:10:48 +0000 (12:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Aug 2016 16:10:48 +0000 (12:10 -0400)

Trivial merge