Merge branch 'hotfix/1.0.13' v1.0.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 25 Apr 2017 14:22:31 +0000 (10:22 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 25 Apr 2017 14:22:31 +0000 (10:22 -0400)

Trivial merge