Merge tag 'V1.2.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 14:44:09 +0000 (10:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 14:44:09 +0000 (10:44 -0400)
commitaad00bc53f3c2469fe55fedf341999ddcf12c85d
treeb9355f33b681998cb55ea484b908bc6f77490a58
parent2619f196202a63111ff8428f18a5727230937521
parente5f04176494b22d558204f8aa0c7eed8c8d4a635
Merge tag 'V1.2.17' into develop

v1.2.17