Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:34:27 +0000 (11:34 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:34:27 +0000 (11:34 -0400)

Trivial merge