Merge branch 'hotfix/2.0.5' v2.0.5
authorlaury <laury@gaslightmedia.com>
Fri, 3 Jun 2016 19:09:34 +0000 (15:09 -0400)
committerlaury <laury@gaslightmedia.com>
Fri, 3 Jun 2016 19:09:34 +0000 (15:09 -0400)

Trivial merge