Merge branch 'hotfix/1.0.13'
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 13:16:32 +0000 (09:16 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 13:16:32 +0000 (09:16 -0400)

Trivial merge