Merge branch 'hotfix/1.0.13' v1.0.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 23 May 2017 13:28:50 +0000 (09:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 23 May 2017 13:28:50 +0000 (09:28 -0400)

Trivial merge