Merge tag 'v1.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:30:06 +0000 (15:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:30:06 +0000 (15:30 -0500)
v1.0.5


Trivial merge