Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 14 Apr 2017 20:42:20 +0000 (16:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 14 Apr 2017 20:42:20 +0000 (16:42 -0400)
v1.0.17


Trivial merge