Merge branch 'hotfix/2.1.22' v2.1.22
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 13:12:10 +0000 (09:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 13:12:10 +0000 (09:12 -0400)

Trivial merge