Merge tag 'v1.2.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:10:44 +0000 (15:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:10:44 +0000 (15:10 -0400)
v1.2.2


Trivial merge