Merge branch 'release/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 May 2017 21:02:37 +0000 (17:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 May 2017 21:02:37 +0000 (17:02 -0400)

Trivial merge