Merge tag 'v1.2.20' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 17:16:13 +0000 (12:16 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 17:16:13 +0000 (12:16 -0500)
v1.2.20


Trivial merge