Merge branch 'release/1.0.30' v1.0.30
authorLaury GvR <laury@gaslightmedia.com>
Wed, 21 Jun 2017 18:08:00 +0000 (14:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 21 Jun 2017 18:08:00 +0000 (14:08 -0400)

Trivial merge