Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Dec 2017 17:49:27 +0000 (12:49 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Dec 2017 17:49:27 +0000 (12:49 -0500)
v1.0.17


Trivial merge