Merge branch 'hotfix/1.1.5'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:55:42 +0000 (15:55 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:55:42 +0000 (15:55 -0500)

Trivial merge