Merge tag 'V1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jul 2015 15:35:09 +0000 (11:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jul 2015 15:35:09 +0000 (11:35 -0400)
v1.0.5


Trivial merge