Merge branch 'hotfix/v1.0.14' vv1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:20:44 +0000 (17:20 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:20:44 +0000 (17:20 -0500)

Trivial merge