Merge branch 'hotfix/2.0.5' v2.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:47:54 +0000 (13:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:47:54 +0000 (13:47 -0400)

Trivial merge