Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:29:01 +0000 (17:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:29:01 +0000 (17:29 -0500)
commitf2b09978c79301bd3f8a0d61e32662a615984646
treefbd8ac81a40d672ace15628ff407782f3732186f
parent645a0a58e8b7d0c263b5cb432ea5bc8cdae1ad56
parent29456a022ef58369e3ccc644fc5a413578ccb9c1
Merge tag 'v1.0.18' into develop

v1.0.18