Merge branch 'hotfix/1.1.5' v1.1.5
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 16:51:36 +0000 (12:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 16:51:36 +0000 (12:51 -0400)

Trivial merge