Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 13:26:32 +0000 (09:26 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 13:26:32 +0000 (09:26 -0400)

Trivial merge