Merge branch 'hotfix/1.1.17'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:26:55 +0000 (16:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:26:55 +0000 (16:26 -0400)

Trivial merge