Merge branch 'hotfix/1.0.11' v1.0.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 13:22:36 +0000 (09:22 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 13:22:36 +0000 (09:22 -0400)

Trivial merge