Merge branch 'hotfix/2.0.4' v2.0.4
authorLaury GvR <laury@gaslightmedia.com>
Wed, 23 Mar 2016 19:54:47 +0000 (15:54 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 23 Mar 2016 19:54:47 +0000 (15:54 -0400)

Trivial merge