Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 May 2017 19:59:31 +0000 (15:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 May 2017 19:59:31 +0000 (15:59 -0400)
v1.0.17


Trivial merge