Merge tag 'v1.2.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 13:54:35 +0000 (08:54 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 13:54:35 +0000 (08:54 -0500)
commitd55edfcd3285134e8ae6e8ec12338b98c5dccf03
tree9f3e5e80dd003785dcfa118ac7c721f7abed48db
parentc567218f7e103d07b01df12249bc5748f647bf57
parent854f675735d7db75cb3ae06ced16caf88495fd8a
Merge tag 'v1.2.17' into develop

v1.2.17