Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:45:30 +0000 (09:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Apr 2016 13:45:30 +0000 (09:45 -0400)
v1.0.4


Trivial merge