Merge tag 'v1.5.22' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 14:29:59 +0000 (10:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 14:29:59 +0000 (10:29 -0400)
v1.5.22


Trivial merge