Merge tag 'V1.2.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 23 May 2016 20:23:57 +0000 (16:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 23 May 2016 20:23:57 +0000 (16:23 -0400)
v1.2.2


Trivial merge