Merge branch 'hotfix/2.0.13' v2.0.13
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 13:18:18 +0000 (09:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 13:18:18 +0000 (09:18 -0400)

Trivial merge