Merge tag 'V1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 1 May 2015 19:00:58 +0000 (15:00 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 1 May 2015 19:00:58 +0000 (15:00 -0400)
1.0.4


Trivial merge