Merge branch 'hotfix/1.1.5' V1.1.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:24:48 +0000 (17:24 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:24:48 +0000 (17:24 -0500)

Trivial merge