Merge branch 'hotfix/1.2.22' V1.2.22
authorLaury GvR <laury@gaslightmedia.com>
Thu, 25 May 2017 13:32:11 +0000 (09:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 25 May 2017 13:32:11 +0000 (09:32 -0400)
commitc591e3af520c953b42f92999bed957e38c0c10e1
treeb57de409d8b53b175e1c000eeaec41b7d49d316a
parentab253a7ae4e5d17b82b1739597aff4c500552c88
parented1a17de0c5a74bcabb41cd68409b424f483e5af
Merge branch 'hotfix/1.2.22'