Merge branch 'hotfix/2.0.6' v2.0.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:49:10 +0000 (13:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:49:10 +0000 (13:49 -0400)

Trivial merge