Merge branch 'hotfix/1.5.22' v1.5.22
authorLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 14:29:54 +0000 (10:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 14:29:54 +0000 (10:29 -0400)

Trivial merge