Merge branch 'hotfix/1.6.1' v1.6.1
authorLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 16:09:43 +0000 (12:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 16:09:43 +0000 (12:09 -0400)

Trivial merge