Merge branch 'hotfix/1.1.14' v1.1.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 13:57:59 +0000 (08:57 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 13:57:59 +0000 (08:57 -0500)

Trivial merge