Merge tag 'v1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:27:06 +0000 (16:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:27:06 +0000 (16:27 -0400)
commitd74c47eb56d30b7d6b814c9075da696aa93aaebb
treeac7dc80f77f84f9dd8a00d2f5f0ea006c892be7b
parent2ccf2640609908d497939398afe3dcf508faafe0
parentf5122dd5d33d16606588e6f8eaaead60d9feae6e
Merge tag 'v1.1.17' into develop

v1.1.17