Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:06:12 +0000 (11:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:06:12 +0000 (11:06 -0400)
v1.0.5


Trivial merge