Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 5 Jul 2017 13:56:47 +0000 (09:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 5 Jul 2017 13:56:47 +0000 (09:56 -0400)
v1.0.5


Trivial merge