Merge tag 'V1.1.20' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:12:42 +0000 (11:12 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:12:42 +0000 (11:12 -0500)
v1.1.20


Trivial merge