Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:46:43 +0000 (09:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:46:43 +0000 (09:46 -0400)
commit8011db9c996a9598ca9a2e4710f95b8cbd17a4ee
tree17a7cbbdeabb4359cf2c3037e0d40386635161b6
parentde4cbf62ae39ca5f9cb8a9efa285242a1011d211
parentc95fe25468f55cd766342a33d49a6985ef0b9170
Merge tag 'v1.0.17' into develop

v1.0.17