Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 14:45:58 +0000 (10:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 14:45:58 +0000 (10:45 -0400)
v1.0.5


Trivial merge