Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jan 2016 19:00:18 +0000 (14:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jan 2016 19:00:18 +0000 (14:00 -0500)
v1.0.4


Trivial merge