Merge branch 'hotfix/1.2.20' v1.2.20
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 17:16:05 +0000 (12:16 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 17:16:05 +0000 (12:16 -0500)

Trivial merge