Merge tag 'v2.1.22' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 13:12:14 +0000 (09:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 13:12:14 +0000 (09:12 -0400)
v2.1.22


Trivial merge