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

Trivial merge