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


Trivial merge