Merge tag 'v1.0.40' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 13:27:31 +0000 (09:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 13:27:31 +0000 (09:27 -0400)
v1.0.40


Trivial merge