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

Trivial merge