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


Trivial merge