Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 18:10:51 +0000 (14:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 18:10:51 +0000 (14:10 -0400)
v1.0.5


Trivial merge