Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 21 Dec 2016 20:25:38 +0000 (15:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 21 Dec 2016 20:25:38 +0000 (15:25 -0500)
v1.0.4


Trivial merge