Merge tag 'v1.6.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 16:09:46 +0000 (12:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 16:09:46 +0000 (12:09 -0400)
v1.6.1


Trivial merge