Merge branch 'hotfix/1.0.14'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:34:08 +0000 (16:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:34:08 +0000 (16:34 -0400)

Trivial merge