Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 20:25:36 +0000 (15:25 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 20:25:36 +0000 (15:25 -0500)

Trivial merge