Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Mar 2017 16:02:48 +0000 (11:02 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Mar 2017 16:02:48 +0000 (11:02 -0500)

Trivial merge