Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 27 Apr 2017 18:27:43 +0000 (14:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 27 Apr 2017 18:27:43 +0000 (14:27 -0400)

Trivial merge