Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Oct 2017 18:28:51 +0000 (14:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Oct 2017 18:28:51 +0000 (14:28 -0400)
v1.0.17


Trivial merge