Merge branch 'hotfix/1.2.21' v1.2.21
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 19:12:49 +0000 (14:12 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 19:12:49 +0000 (14:12 -0500)

Trivial merge