Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 24 Jun 2016 12:17:51 +0000 (08:17 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 24 Jun 2016 12:17:51 +0000 (08:17 -0400)

Trivial merge