Merge branch 'hotfix/1.3.8' V1.3.8
authorLaury GvR <laury@gaslightmedia.com>
Fri, 23 Oct 2015 18:21:47 +0000 (14:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 23 Oct 2015 18:21:47 +0000 (14:21 -0400)

Trivial merge