Merge branch 'hotfix/1.1.3' V1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 15:08:21 +0000 (10:08 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Dec 2015 15:08:21 +0000 (10:08 -0500)

Trivial merge