Merge tag 'v1.2.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jul 2016 15:42:09 +0000 (11:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jul 2016 15:42:09 +0000 (11:42 -0400)
v1.2.2


Trivial merge