Merge branch 'hotfix/1.0.14' v1.0.14
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 14:17:57 +0000 (10:17 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 14:17:57 +0000 (10:17 -0400)

Trivial merge