Merge branch 'hotfix/1.1.5' v1.1.5
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 21:36:04 +0000 (17:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 21:36:04 +0000 (17:36 -0400)

Trivial merge