Merge tag 'v1.0.20' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:01:32 +0000 (13:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:01:32 +0000 (13:01 -0400)
v1.0.20


Trivial merge