Merge branch 'release/1.6.0' v1.6.0
authorLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 16:04:16 +0000 (12:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 16:04:16 +0000 (12:04 -0400)

Trivial merge