Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 16 Jun 2017 18:18:10 +0000 (14:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 16 Jun 2017 18:18:10 +0000 (14:18 -0400)
v1.0.5


Trivial merge