Merge tag 'v1.0.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:14:17 +0000 (17:14 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 5 Mar 2015 22:14:17 +0000 (17:14 -0500)
v1.0.4


Trivial merge