Merge branch 'hotfix/1.3.7' V1.3.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 19 Oct 2015 20:36:22 +0000 (16:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 19 Oct 2015 20:36:22 +0000 (16:36 -0400)

Trivial merge