Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 16:07:27 +0000 (12:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 16:07:27 +0000 (12:07 -0400)
v1.0.18


Trivial merge