Merge branch 'hotfix/1.1.17' v1.1.17
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 Aug 2016 15:29:43 +0000 (11:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 Aug 2016 15:29:43 +0000 (11:29 -0400)

Trivial merge