Merge tag 'v1.0.20' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 Feb 2016 17:02:49 +0000 (12:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 Feb 2016 17:02:49 +0000 (12:02 -0500)
v1.0.20


Trivial merge