Merge tag 'v1.0.20' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:58:19 +0000 (10:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:58:19 +0000 (10:58 -0400)
v1.0.20


Trivial merge