Merge tag 'V1.1.22' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 9 Dec 2015 20:27:30 +0000 (15:27 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 9 Dec 2015 20:27:30 +0000 (15:27 -0500)
v1.1.22


Trivial merge