Merge branch 'hotfix/2.0.6' v2.0.6
authorlaury <laury@gaslightmedia.com>
Mon, 6 Jun 2016 20:28:34 +0000 (16:28 -0400)
committerlaury <laury@gaslightmedia.com>
Mon, 6 Jun 2016 20:28:34 +0000 (16:28 -0400)

Trivial merge