Merge branch 'hotfix/1.1.21' V1.1.21
authorLaury GvR <laury@gaslightmedia.com>
Wed, 9 Dec 2015 20:05:01 +0000 (15:05 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 9 Dec 2015 20:05:01 +0000 (15:05 -0500)

Trivial merge