Merge branch 'hotfix/1.1.13' V1.1.13
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Sep 2016 20:18:24 +0000 (16:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Sep 2016 20:18:24 +0000 (16:18 -0400)

Trivial merge