Merge branch 'hotfix/1.1.13'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 16:33:53 +0000 (11:33 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 16:33:53 +0000 (11:33 -0500)

Trivial merge