Merge branch 'hotfix/1.3.1' V1.3.1
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 15:57:20 +0000 (11:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 15:57:20 +0000 (11:57 -0400)

Trivial merge