Merge tag 'v1.2.22' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 21:10:34 +0000 (16:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 21:10:34 +0000 (16:10 -0500)
v1.2.22


Trivial merge