Merge branch 'hotfix/1.5.21' v1.5.21
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:27:16 +0000 (09:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:27:16 +0000 (09:27 -0400)

Trivial merge