Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Jun 2016 16:04:15 +0000 (12:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Jun 2016 16:04:15 +0000 (12:04 -0400)
v1.0.5


Trivial merge